From 11e30aa5ff4b2716b2998685c6c3f0523a859578 Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Thu, 14 Sep 2023 17:05:26 +0200
Subject: [PATCH] Update marshal descriptions

---
 GIS Base Map/Gun Run.qgs           | 8903 ++++++++++++---------------
 GIS Base Map/Gun Run.qgs~          | 8905 ++++++++++++----------------
 GIS Base Map/marshal_positions.dbf |  Bin 56876 -> 57082 bytes
 GIS Base Map/marshal_positions.shp |  Bin 15036 -> 15156 bytes
 GIS Base Map/marshal_positions.shx |  Bin 4500 -> 4516 bytes
 5 files changed, 7515 insertions(+), 10293 deletions(-)

diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index 91cd9ec..a6fc739 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" saveUser="tim" saveDateTime="2023-09-11T20:50:30" saveUserFull="Timothy Allen" version="3.32.2-Lima">
+<qgis saveUser="tim" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2023-09-14T17:03:35" version="3.32.2-Lima">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,16 +17,16 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer combined-method="0" edl-strength="1000" edl-is-active="1" hillshading-z-factor="1" edl-distance="0.5" hillshading-is-multidirectional="0" is-active="0" light-altitude="45" hillshading-is-active="0" edl-distance-unit="0" light-azimuth="315"/>
+  <elevation-shading-renderer light-azimuth="315" edl-is-active="1" edl-distance="0.5" edl-distance-unit="0" hillshading-is-multidirectional="0" combined-method="0" edl-strength="1000" hillshading-is-active="0" hillshading-z-factor="1" is-active="0" light-altitude="45"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0" name="marshal_positions" expanded="1" legend_split_behavior="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" name="marshal_positions" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -36,26 +36,26 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./extra_security.shp" patch_size="0,0" name="extra_security" expanded="1" legend_split_behavior="0" id="extra_security20170921130834191" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="extra_security20170921130834191" legend_exp="" name="extra_security" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./extra_security.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0" name="marshals_by_position" expanded="1" legend_split_behavior="0" id="marshals_by_position20161003112326575" providerKey="delimitedtext" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="marshals_by_position20161003112326575" legend_exp="" name="marshals_by_position" legend_split_behavior="0" patch_size="0,0" expanded="1" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" providerKey="delimitedtext">
         <customproperties>
           <Option type="Map">
             <Option value="1" name="showFeatureCount" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0" name="complete_marshal_overview" expanded="1" legend_split_behavior="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" name="complete_marshal_overview" legend_split_behavior="0" patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0" name="marshal_overviews" expanded="0" legend_split_behavior="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" name="marshal_overviews" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option value="" name="legend/expressionFilter" type="QString"/>
@@ -64,11 +64,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./fencing.shp|layername=fencing" patch_size="0,0" name="fencing" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
@@ -77,39 +77,31 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" patch_size="-1,-1" name="cone_groups" expanded="1" legend_split_behavior="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" legend_exp="" name="cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" patch_size="-1,-1" name="fence_groups" expanded="1" legend_split_behavior="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_exp="" name="fence_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" patch_size="-1,-1" name="fence_and_cone_groups" expanded="1" legend_split_behavior="0" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" legend_exp="" name="fence_and_cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked" groupLayer="">
+      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={392dec0f-b023-4796-b201-df13a63aa0a4}" patch_size="-1,-1" name="route_markers" expanded="1" legend_split_behavior="0" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" providerKey="memory" legend_exp="" checked="Qt::Checked">
-          <customproperties>
-            <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option value="1" name="showFeatureCount" type="int"/>
-            </Option>
-          </customproperties>
-        </layer-tree-layer>
-        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={86c95bbf-8adf-46bc-9c84-b2aee8f8f689}" patch_size="-1,-1" name="route_markers" expanded="1" legend_split_behavior="0" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" providerKey="memory" legend_exp="" checked="Qt::Unchecked">
+        <layer-tree-layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" legend_exp="" name="route_markers" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" checked="Qt::Unchecked" providerKey="memory">
           <customproperties>
             <Option type="Map">
               <Option name="expandedLegendNodes" type="invalid"/>
@@ -118,7 +110,7 @@
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -127,16 +119,16 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer source="./timelapse.shp|layername=timelapse" patch_size="0,0" name="timelapse" expanded="0" legend_split_behavior="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" name="timelapse" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" providerKey="ogr">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./water_tables.shp" patch_size="0,0" name="water_tables" expanded="1" legend_split_behavior="0" id="water_tables20170921142016467" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="water_tables20170921142016467" legend_exp="" name="water_tables" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./water_tables.shp" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -144,67 +136,67 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" name="poi_labels" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" name="directions_to_start" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./mayor.shp" patch_size="0,0" name="mayor" expanded="1" legend_split_behavior="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" name="mayor" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./mayor.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./viplabels.shp" patch_size="0,0" name="viplabels" expanded="1" legend_split_behavior="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" name="viplabels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./viplabels.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./vipaccess.shp" patch_size="0,0" name="vipaccess" expanded="1" legend_split_behavior="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" name="vipaccess" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./vipaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./golfaccess.shp" patch_size="0,0" name="golfaccess" expanded="0" legend_split_behavior="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" name="golfaccess" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./golfaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" name="residents_access_roads" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access.shp|layername=residents_access" patch_size="0,0" name="residents_access" expanded="1" legend_split_behavior="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" name="residents_access" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./osm_roads.shp" patch_size="0,0" name="osm_roads" expanded="0" legend_split_behavior="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" name="osm_roads" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./osm_roads.shp" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -212,7 +204,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./osm_places.shp|layername=osm_places" patch_size="0,0" name="osm_places" expanded="1" legend_split_behavior="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" name="osm_places" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -221,18 +213,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Start and Finish pages" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./data-comments.shp" patch_size="0,0" name="data-comments" expanded="1" legend_split_behavior="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" name="data-comments" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./data-comments.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./start_finish_area.shp" patch_size="0,0" name="start_finish_area" expanded="1" legend_split_behavior="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" name="start_finish_area" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./start_finish_area.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -240,11 +232,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./capetownelevation-1m.shp" patch_size="0,0" name="capetownelevation-1m" expanded="1" legend_split_behavior="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" name="capetownelevation-1m" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option value="1" name="showFeatureCount" type="QString"/>
@@ -252,18 +244,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" legend_split_behavior="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" providerKey="gdal">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" patch_size="0,0" name="Outlines" expanded="1" legend_split_behavior="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" name="Outlines" legend_split_behavior="0" patch_size="0,0" expanded="1" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" providerKey="wms">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -298,38 +290,36 @@
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
       <item>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</item>
-      <item>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</item>
       <item>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings mode="3" enabled="0" tolerance="10" scaleDependencyMode="0" unit="1" maxScale="0" type="1" intersection-snapping="1" minScale="0" self-snapping="1">
+  <snapping-settings enabled="0" maxScale="0" mode="3" tolerance="10" self-snapping="1" minScale="0" type="1" intersection-snapping="1" unit="1" scaleDependencyMode="0">
     <individual-layer-settings>
-      <layer-setting enabled="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="0" id="extra_security20170921130834191" maxScale="0" type="2" minScale="0" units="2"/>
-      <layer-setting enabled="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="0" id="water_tables20170921142016467" maxScale="0" type="2" minScale="0" units="2"/>
-      <layer-setting enabled="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" minScale="0" units="1"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" maxScale="0" tolerance="20" minScale="0" type="2" units="1"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
+      <layer-setting id="water_tables20170921142016467" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="extra_security20170921130834191" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -337,10 +327,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.40462507648904733</xmin>
-      <ymin>-33.91260376305159951</ymin>
-      <xmax>18.41657121417798493</xmax>
-      <ymax>-33.90048855131077943</ymax>
+      <xmin>18.39449634270076572</xmin>
+      <ymin>-33.90828503601445476</ymin>
+      <xmax>18.39585035230306787</xmax>
+      <ymax>-33.90669064043363079</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -361,176 +351,171 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="marshal_positions" checked="Qt::Checked" open="true" showFeatureCount="1">
+    <legendgroup open="true" name="Marshals" checked="Qt::Checked">
+      <legendlayer open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="extra_security" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshals_by_position" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+      <legendlayer open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="complete_marshal_overview" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshal_overviews" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+      <legendlayer open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="fencing" checked="Qt::Checked" open="true" showFeatureCount="0">
+    <legendgroup open="true" name="Fencing and Cones" checked="Qt::Unchecked">
+      <legendlayer open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="cone_groups" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" visible="0"/>
+          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="fence_groups" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0"/>
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="fence_and_cone_groups" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" visible="0"/>
+          <legendlayerfile layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" checked="Qt::Checked" open="true">
-      <legendgroup name="Markers" checked="Qt::Checked" open="true">
-        <legendlayer drawingOrder="-1" name="route_markers" checked="Qt::Checked" open="true" showFeatureCount="1">
+    <legendgroup open="true" name="Routes" checked="Qt::Checked">
+      <legendgroup open="true" name="Markers" checked="Qt::Checked">
+        <legendlayer open="true" name="route_markers" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
           <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
-          </filegroup>
-        </legendlayer>
-        <legendlayer drawingOrder="-1" name="route_markers" checked="Qt::Unchecked" open="true" showFeatureCount="1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" visible="0"/>
+            <legendlayerfile layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" isInOverview="0" visible="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" name="all_routes" checked="Qt::Checked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" name="timelapse" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+    <legendlayer open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
       <filegroup open="false" hidden="false">
-        <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="water_tables" checked="Qt::Checked" open="true" showFeatureCount="0">
+    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
+      <legendlayer open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="poi_labels" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
+      <legendlayer open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="directions_to_start" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="mayor" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
+      <legendlayer open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="viplabels" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="vipaccess" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="golfaccess" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+      <legendlayer open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access_roads" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="osm_roads" checked="Qt::Checked" open="false" showFeatureCount="1">
+    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
+      <legendlayer open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="osm_places" checked="Qt::Checked" open="true" showFeatureCount="1">
+      <legendlayer open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
-      <legendlayer drawingOrder="-1" name="data-comments" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
+      <legendlayer open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="start_finish_area" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="capetownelevation-1m" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
+      <legendlayer open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Checked" open="false" showFeatureCount="0">
+    <legendgroup open="true" name="Map" checked="Qt::Checked">
+      <legendlayer open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="Outlines" checked="Qt::Checked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" maxScale="0" refreshOnNotifyEnabled="0" type="annotation" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="0">
+  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" styleCategories="AllStyleCategories" type="annotation" refreshOnNotifyEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -591,7 +576,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" maxScale="100000" refreshOnNotifyEnabled="0" type="raster" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -657,7 +642,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -668,9 +653,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"/>
@@ -682,13 +667,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal enabled="0" mode="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" symbology="Line" band="1" zscale="1" zoffset="0">
+      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -697,7 +682,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -705,7 +690,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
+            <layer enabled="1" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -746,7 +731,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -754,7 +739,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
+            <layer enabled="1" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -800,9 +785,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" enabled="false" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer blueBand="3" nodataColor="" redBand="1" alphaBand="-1" type="multibandcolor" opacity="0.5" greenBand="2">
+        <rasterrenderer blueBand="3" alphaBand="-1" opacity="0.5" type="multibandcolor" redBand="1" nodataColor="" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -813,14 +798,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeBlue="128"/>
+        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
+        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" maxScale="0" refreshOnNotifyEnabled="0" type="raster" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -886,7 +871,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -897,7 +882,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"/>
@@ -909,13 +894,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal enabled="0" mode="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" symbology="Line" band="1" zscale="1" zoffset="0">
+      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -924,7 +909,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -932,7 +917,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
+            <layer enabled="1" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -973,7 +958,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -981,7 +966,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
+            <layer enabled="1" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -1027,9 +1012,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" enabled="false" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer nodataColor="" alphaBand="-1" band="1" type="singlebandcolordata" opacity="0.75">
+        <rasterrenderer band="1" alphaBand="-1" opacity="0.75" type="singlebandcolordata" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1040,14 +1025,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeBlue="128"/>
+        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
+        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1113,7 +1098,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="EPSG:4326" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1127,8 +1112,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="length_km" type="6" expression="$length * 100" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="length_m" type="6" expression="$length * 100 * 1000" comment="" subType="0" length="-1"/>
+        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1141,13 +1126,13 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="RouteLen" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="RouteLen" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -1156,7 +1141,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1164,7 +1149,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
+            <layer enabled="1" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -1205,7 +1190,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1213,7 +1198,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
+            <layer enabled="1" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -1238,7 +1223,7 @@
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1246,7 +1231,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
+            <layer enabled="1" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -1279,19 +1264,19 @@
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" label="Show by day" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0">
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="21KM" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1"/>
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="10KM" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2"/>
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3"/>
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="Trail" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4"/>
+          <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; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" description="Only show when active in Atlas" symbol="0">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" symbol="1"/>
+            <rule filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" symbol="2"/>
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" symbol="3"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" symbol="4"/>
           </rule>
-          <rule checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5"/>
-          <rule checkstate="0" label="Always show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0" label="Always show" symbol="5"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" checkstate="0" label="Always show by day" symbol="6"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1299,7 +1284,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
+            <layer enabled="1" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1336,7 +1321,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1344,7 +1329,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
+                <layer enabled="1" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="0,0,0,255" name="color" type="QString"/>
@@ -1366,7 +1351,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@0@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -1374,7 +1359,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
+                    <layer enabled="1" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -1406,7 +1391,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
+            <layer enabled="1" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -1455,7 +1440,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
+            <layer enabled="1" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1481,7 +1466,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1489,7 +1474,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
+                <layer enabled="1" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1527,7 +1512,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
+            <layer enabled="1" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1553,7 +1538,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1561,7 +1546,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
+                <layer enabled="1" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1600,7 +1585,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1608,7 +1593,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}">
+            <layer enabled="1" id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1645,7 +1630,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1653,7 +1638,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
+                <layer enabled="1" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="210,32,39,255" name="color" type="QString"/>
@@ -1675,7 +1660,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -1683,7 +1668,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
+                    <layer enabled="1" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -1715,7 +1700,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
+            <layer enabled="1" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -1764,7 +1749,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
+            <layer enabled="1" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1790,7 +1775,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1798,7 +1783,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
+                <layer enabled="1" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1836,7 +1821,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
+            <layer enabled="1" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1862,7 +1847,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1870,7 +1855,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
+                <layer enabled="1" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1909,7 +1894,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1917,7 +1902,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
+            <layer enabled="1" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1954,7 +1939,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1962,7 +1947,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
+                <layer enabled="1" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -1984,7 +1969,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@2@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -1992,7 +1977,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
+                    <layer enabled="1" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -2024,7 +2009,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
+            <layer enabled="1" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2073,7 +2058,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
+            <layer enabled="1" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2099,7 +2084,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2107,7 +2092,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
+                <layer enabled="1" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2145,7 +2130,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
+            <layer enabled="1" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2171,7 +2156,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2179,7 +2164,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
+                <layer enabled="1" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2218,7 +2203,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2226,7 +2211,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
+            <layer enabled="1" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2263,7 +2248,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2271,7 +2256,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
+                <layer enabled="1" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="145,211,55,255" name="color" type="QString"/>
@@ -2293,7 +2278,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@3@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@3@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -2301,7 +2286,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
+                    <layer enabled="1" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -2333,7 +2318,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
+            <layer enabled="1" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2382,7 +2367,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
+            <layer enabled="1" id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2408,7 +2393,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2416,7 +2401,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
+                <layer enabled="1" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2454,7 +2439,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
+            <layer enabled="1" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2480,7 +2465,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2488,7 +2473,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
+                <layer enabled="1" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2527,7 +2512,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2535,7 +2520,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
+            <layer enabled="1" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2572,7 +2557,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@4@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2580,7 +2565,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
+                <layer enabled="1" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="0,72,255,255" name="color" type="QString"/>
@@ -2602,7 +2587,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@4@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@4@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -2610,7 +2595,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
+                    <layer enabled="1" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -2642,7 +2627,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
+            <layer enabled="1" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2691,7 +2676,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
+            <layer enabled="1" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2717,7 +2702,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@4@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2725,7 +2710,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
+                <layer enabled="1" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2763,7 +2748,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
+            <layer enabled="1" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2789,7 +2774,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@4@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2797,7 +2782,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
+                <layer enabled="1" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2836,7 +2821,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="5" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2844,7 +2829,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
+            <layer enabled="1" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2889,7 +2874,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="6" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="6" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2897,7 +2882,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
+            <layer enabled="1" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2949,14 +2934,14 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" active="0" description="Active routes">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="round($length / 1000, 0)" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round($length / 1000, 0)" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -2964,7 +2949,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -2995,7 +2980,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -3003,7 +2988,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -3038,7 +3023,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -3048,9 +3033,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="km_marker()" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="LineGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="1" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="1" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3101,7 +3086,7 @@
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -3115,14 +3100,14 @@
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
+          <rule key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" active="0" description="Route lengths">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="round( $length * 100, 4 )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100, 4 )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -3130,7 +3115,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -3161,7 +3146,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -3169,7 +3154,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -3204,7 +3189,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -3214,9 +3199,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="km_marker()" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="LineGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="50" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapAtNoCost" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapAtNoCost" repeatDistance="50" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3267,7 +3252,7 @@
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -3292,6 +3277,7 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
           <Option value="0" name="embeddedWidgets/count" type="QString"/>
           <Option name="variableNames" type="invalid"/>
@@ -3302,11 +3288,11 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3314,7 +3300,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}">
+              <layer enabled="1" id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -3356,7 +3342,7 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3365,14 +3351,14 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3382,7 +3368,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3392,7 +3378,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3402,7 +3388,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3412,7 +3398,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3422,21 +3408,21 @@
             </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="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3446,7 +3432,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3456,7 +3442,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3468,16 +3454,16 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="begin"/>
-        <alias index="2" name="" field="end"/>
-        <alias index="3" name="" field="Distance"/>
-        <alias index="4" name="" field="RouteLen"/>
-        <alias index="5" name="" field="Sort"/>
-        <alias index="6" name="" field="day"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="length_m"/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -3492,61 +3478,61 @@
         <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <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="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="length_km" type="6" expression="$length * 100" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="length_m" type="6" expression="$length * 100 * 1000" comment="" subType="0" length="-1"/>
+        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column name="Name" width="121" type="field" hidden="0"/>
-          <column name="begin" width="141" type="field" hidden="0"/>
-          <column name="end" width="31" type="field" hidden="0"/>
-          <column name="Distance" width="66" type="field" hidden="0"/>
+          <column width="121" name="Name" type="field" hidden="0"/>
+          <column width="141" name="begin" type="field" hidden="0"/>
+          <column width="31" name="end" type="field" hidden="0"/>
+          <column width="66" name="Distance" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="RouteLen" width="39" type="field" hidden="0"/>
-          <column name="Source" width="250" type="field" hidden="0"/>
-          <column name="length_m" width="175" type="field" hidden="0"/>
-          <column name="Sort" width="50" type="field" hidden="0"/>
-          <column name="day" width="31" type="field" hidden="0"/>
-          <column name="length_km" width="266" type="field" hidden="0"/>
+          <column width="39" name="RouteLen" type="field" hidden="0"/>
+          <column width="250" name="Source" type="field" hidden="0"/>
+          <column width="175" name="length_m" type="field" hidden="0"/>
+          <column width="50" name="Sort" type="field" hidden="0"/>
+          <column width="31" name="day" type="field" hidden="0"/>
+          <column width="266" name="length_km" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3606,25 +3592,25 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3698,13 +3684,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3713,7 +3699,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3721,7 +3707,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
+            <layer enabled="1" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -3762,7 +3748,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3770,7 +3756,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
+            <layer enabled="1" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -3795,7 +3781,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3803,7 +3789,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}">
+            <layer enabled="1" id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -3836,9 +3822,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3846,7 +3832,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
+            <layer enabled="1" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -3899,28 +3885,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -3929,9 +3915,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="ID"/>
-        <alias index="1" name="" field="height"/>
-        <alias index="2" name="" field="elevation"/>
+        <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"/>
@@ -3939,25 +3925,25 @@ def my_form_open(dialog, layer, feature):
         <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" field="elevation"/>
+        <default expression="" applyOnUpdate="0" field="ID"/>
+        <default expression="" applyOnUpdate="0" field="height"/>
+        <default expression="" applyOnUpdate="0" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="ID" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="height" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="ID" exp=""/>
-        <constraint desc="" field="height" exp=""/>
-        <constraint desc="" field="elevation" exp=""/>
+        <constraint desc="" exp="" field="ID"/>
+        <constraint desc="" exp="" field="height"/>
+        <constraint desc="" exp="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3980,7 +3966,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4056,13 +4042,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4071,7 +4057,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4079,7 +4065,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
+            <layer enabled="1" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -4120,7 +4106,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4128,7 +4114,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
+            <layer enabled="1" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4153,7 +4139,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4161,7 +4147,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
+            <layer enabled="1" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -4194,9 +4180,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4204,7 +4190,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
+            <layer enabled="1" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4241,37 +4227,37 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -4280,10 +4266,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <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"/>
@@ -4292,28 +4278,28 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="page" exp=""/>
-        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4336,7 +4322,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4402,7 +4388,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4431,13 +4417,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4446,7 +4432,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4454,7 +4440,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -4495,7 +4481,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4503,7 +4489,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4528,7 +4514,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4536,7 +4522,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -4569,9 +4555,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4579,7 +4565,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4623,11 +4609,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="1" spacing="5" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="0" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" style="0" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4635,7 +4621,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -4677,7 +4663,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4686,7 +4672,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -4696,45 +4682,45 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -4743,12 +4729,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="day"/>
-        <alias index="4" name="" field="fence_len"/>
-        <alias index="5" name="" field="cone_len"/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
+        <alias name="" index="5" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -4759,40 +4745,40 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="fence_len" exp=""/>
-        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" width="306" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column width="306" name="name" type="field" hidden="0"/>
+          <column width="-1" name="group" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="cone_len" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -4839,18 +4825,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4926,13 +4912,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4941,7 +4927,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4949,7 +4935,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -4990,7 +4976,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4998,7 +4984,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -5023,7 +5009,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5031,7 +5017,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -5064,9 +5050,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5074,7 +5060,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -5118,11 +5104,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="1" spacing="5" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="0" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" style="0" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5130,7 +5116,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -5172,7 +5158,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5181,7 +5167,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -5191,38 +5177,38 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -5231,11 +5217,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="day"/>
-        <alias index="4" name="" field="cone_len"/>
+        <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"/>
@@ -5245,38 +5231,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" width="306" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column width="306" name="name" type="field" hidden="0"/>
+          <column width="-1" name="group" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="cone_len" type="field" hidden="0"/>
+          <column width="-1" name="fence_len" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -5323,18 +5309,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5400,7 +5386,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5425,13 +5411,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5440,7 +5426,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5448,7 +5434,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
+            <layer enabled="1" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -5489,7 +5475,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5497,7 +5483,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
+            <layer enabled="1" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -5522,7 +5508,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5530,7 +5516,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
+            <layer enabled="1" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -5563,9 +5549,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5573,7 +5559,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
+            <layer enabled="1" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -5618,12 +5604,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="Name" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="Name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -5631,7 +5617,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -5655,7 +5641,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5665,9 +5651,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="LineGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="2" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+          <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="LineGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -5687,7 +5673,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -5716,11 +5702,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5728,7 +5714,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
+              <layer enabled="1" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -5770,7 +5756,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5779,21 +5765,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -5802,33 +5788,33 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="Name" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -5874,7 +5860,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="0" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5940,7 +5926,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5965,13 +5951,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5980,7 +5966,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5988,7 +5974,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
+            <layer enabled="1" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -6029,7 +6015,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6037,7 +6023,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
+            <layer enabled="1" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -6062,7 +6048,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6070,7 +6056,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
+            <layer enabled="1" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -6103,14 +6089,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0"/>
-          <rule description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1"/>
-          <rule description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2"/>
+          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" description="Only show when active in Atlas" symbol="0"/>
+          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" description="Only show when active in Atlas" symbol="1"/>
+          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" description="Only show when active in Atlas" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6118,7 +6104,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
+            <layer enabled="1" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6144,7 +6130,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6152,7 +6138,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
+                <layer enabled="1" id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -6184,7 +6170,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
+            <layer enabled="1" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6221,7 +6207,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6229,7 +6215,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
+                <layer enabled="1" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="210,32,39,255" name="color" type="QString"/>
@@ -6251,7 +6237,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@0@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6259,7 +6245,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
+                    <layer enabled="1" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6285,7 +6271,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
+            <layer enabled="1" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -6324,7 +6310,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6332,7 +6318,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
+            <layer enabled="1" id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6369,7 +6355,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6377,7 +6363,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
+                <layer enabled="1" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -6399,7 +6385,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6407,7 +6393,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
+                    <layer enabled="1" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6433,7 +6419,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
+            <layer enabled="1" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6470,7 +6456,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6478,7 +6464,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
+                <layer enabled="1" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -6500,7 +6486,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6508,7 +6494,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}">
+                    <layer enabled="1" id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6534,7 +6520,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
+            <layer enabled="1" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -6573,7 +6559,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6581,7 +6567,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
+            <layer enabled="1" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6618,7 +6604,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6626,7 +6612,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
+                <layer enabled="1" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="69,100,25,255" name="color" type="QString"/>
@@ -6648,7 +6634,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@2@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6656,7 +6642,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
+                    <layer enabled="1" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6682,7 +6668,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
+            <layer enabled="1" id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6719,7 +6705,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6727,7 +6713,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
+                <layer enabled="1" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="69,100,25,255" name="color" type="QString"/>
@@ -6749,7 +6735,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@2@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6757,7 +6743,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
+                    <layer enabled="1" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6783,7 +6769,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
+            <layer enabled="1" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -6842,11 +6828,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -6854,7 +6840,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
+              <layer enabled="1" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -6896,7 +6882,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -6905,21 +6891,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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">
@@ -6931,34 +6917,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="Distance" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7021,7 +7007,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7095,13 +7081,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7110,7 +7096,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7118,7 +7104,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
+            <layer enabled="1" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -7159,7 +7145,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7167,7 +7153,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
+            <layer enabled="1" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -7192,7 +7178,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7200,7 +7186,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
+            <layer enabled="1" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -7233,9 +7219,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.796078">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.796078" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7243,7 +7229,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
+            <layer enabled="1" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -7286,14 +7272,14 @@ 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" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -7301,7 +7287,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -7331,7 +7317,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -7367,9 +7353,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="1" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="1" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -7420,7 +7406,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -7434,14 +7420,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="227,0,185,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="4" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="4" textColor="227,0,185,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -7449,7 +7435,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -7479,7 +7465,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -7500,9 +7486,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="1" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="2" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -7538,7 +7524,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -7703,11 +7689,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -7715,7 +7701,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
+              <layer enabled="1" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -7757,7 +7743,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="10" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="10" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7766,14 +7752,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7783,7 +7769,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7793,7 +7779,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7805,9 +7791,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
+        <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"/>
@@ -7815,30 +7801,30 @@ def my_form_open(dialog, layer, feature):
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="position" exp=""/>
-        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="position" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7914,7 +7900,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
@@ -7980,7 +7966,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8009,13 +7995,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8024,7 +8010,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8032,7 +8018,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
+            <layer enabled="1" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -8073,7 +8059,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8081,7 +8067,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
+            <layer enabled="1" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -8106,7 +8092,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8114,7 +8100,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
+            <layer enabled="1" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -8147,9 +8133,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8157,7 +8143,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
+            <layer enabled="1" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -8201,11 +8187,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -8213,7 +8199,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
+              <layer enabled="1" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -8255,7 +8241,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8264,7 +8250,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -8274,38 +8260,38 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -8314,11 +8300,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="day"/>
-        <alias index="4" name="" field="fence_len"/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -8328,39 +8314,39 @@ def my_form_open(dialog, layer, feature):
         <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" width="415" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
+          <column width="415" name="name" type="field" hidden="0"/>
+          <column width="-1" name="group" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="cone_len" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="fence_len" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8408,19 +8394,19 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8486,7 +8472,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="EPSG:4326" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8500,42 +8486,42 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="cone_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" subType="0" length="-1"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyMaxScale="1" readOnly="0" simplifyDrawingHints="1" simplifyLocal="1" labelsEnabled="1" simplifyAlgorithm="0" simplifyDrawingTol="1" maxScale="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" minScale="1e+08" version="3.8.3-Zanzibar">
+          <qgis simplifyAlgorithm="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" labelsEnabled="1" simplifyMaxScale="1" minScale="1e+08" simplifyDrawingHints="1" styleCategories="AllStyleCategories" readOnly="0" version="3.8.3-Zanzibar" simplifyLocal="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" symbollevels="1" enableorderby="0" type="RuleRenderer">
+            <renderer-v2 enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
-                  <layer locked="0" pass="0" enabled="1" class="SimpleLine">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" type="line" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -8549,17 +8535,17 @@ 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 fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" isExpression="0" multilineHeight="1" fontLetterSpacing="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fieldName="comment" fontWeight="50" textOpacity="0.8" useSubstitutions="0" namedStyle="Regular" fontWordSpacing="0" fontUnderline="0" fontSize="11" blendMode="0" fontItalic="0" fontSizeUnit="Point">
-                      <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-                      <background shapeJoinStyle="128" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.6" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="1" shapeDraw="1" shapeSizeType="0" shapeOpacity="0.6" shapeFillColor="255,255,255,255" shapeBorderColor="255,255,0,255" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeRadiiY="1"/>
-                      <shadow shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetDist="1"/>
+                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Regular" fontWeight="50" blendMode="0" fieldName="comment" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="0.8">
+                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.6" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0"/>
+                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" yOffset="0" repeatDistanceUnits="MM" priority="5" offsetType="0" preserveRotation="1" dist="5" centroidInside="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" maxCurvedCharAngleIn="25" offsetUnits="MM" xOffset="0" geometryGeneratorEnabled="0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" rotationAngle="0" distUnits="MM" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0"/>
-                    <rendering mergeLines="1" limitNumLabels="0" displayAll="1" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" minFeatureSize="0" scaleMin="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
+                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="5" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
+                    <rendering obstacleType="0" displayAll="1" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -8580,17 +8566,17 @@ def my_form_open(dialog, layer, feature):
                     </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 fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" isExpression="1" multilineHeight="1" fontLetterSpacing="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fieldName="round( $length, 1) || 'm'" fontWeight="63" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" fontWordSpacing="0" fontUnderline="0" fontSize="12" blendMode="0" fontItalic="0" fontSizeUnit="Point">
-                      <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                      <background shapeJoinStyle="64" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeRadiiY="0"/>
-                      <shadow shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetDist="1"/>
+                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Semibold" fontWeight="63" blendMode="0" fieldName="round( $length, 1) || 'm'" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="1">
+                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0"/>
+                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" yOffset="0" repeatDistanceUnits="MM" priority="5" offsetType="0" preserveRotation="1" dist="1" centroidInside="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" maxCurvedCharAngleIn="25" offsetUnits="MM" xOffset="0" geometryGeneratorEnabled="0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" rotationAngle="0" distUnits="MM" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0"/>
-                    <rendering mergeLines="0" limitNumLabels="0" displayAll="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" minFeatureSize="0" scaleMin="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
+                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
+                    <rendering obstacleType="0" displayAll="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -8623,12 +8609,12 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory opacity="1" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" backgroundAlpha="255" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" labelPlacementMethod="XHeight">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" color="#000000" field=""/>
+              <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" barWidth="5" backgroundColor="#ffffff" minScaleDenominator="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleDependency="Area" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" placement="2" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+            <DiagramLayerSettings priority="0" obstacle="0" zIndex="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
               <properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -8637,7 +8623,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -8721,81 +8707,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias index="0" name="" field="id"/>
-              <alias index="1" name="" field="group"/>
-              <alias index="2" name="" field="comment"/>
-              <alias index="3" name="" field="moveable"/>
-              <alias index="4" name="" field="type"/>
-              <alias index="5" name="" field="name"/>
-              <alias index="6" name="" field="hidden"/>
-              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
-              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
-              <alias index="9" name="" field="fence_len"/>
-              <alias index="10" name="" field="cone_len"/>
+              <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 applyOnUpdate="0" expression="" field="id"/>
-              <default applyOnUpdate="0" expression="" field="group"/>
-              <default applyOnUpdate="0" expression="" field="comment"/>
-              <default applyOnUpdate="0" expression="" field="moveable"/>
-              <default applyOnUpdate="0" expression="" field="type"/>
-              <default applyOnUpdate="0" expression="" field="name"/>
-              <default applyOnUpdate="0" expression="" field="hidden"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-              <default applyOnUpdate="0" expression="" field="fence_len"/>
-              <default applyOnUpdate="0" expression="" field="cone_len"/>
+              <default expression="" applyOnUpdate="0" field="id"/>
+              <default expression="" applyOnUpdate="0" field="group"/>
+              <default expression="" applyOnUpdate="0" field="comment"/>
+              <default expression="" applyOnUpdate="0" field="moveable"/>
+              <default expression="" applyOnUpdate="0" field="type"/>
+              <default expression="" applyOnUpdate="0" field="name"/>
+              <default expression="" applyOnUpdate="0" field="hidden"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
+              <default expression="" applyOnUpdate="0" field="fence_len"/>
+              <default expression="" applyOnUpdate="0" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint desc="" field="id" exp=""/>
-              <constraint desc="" field="group" exp=""/>
-              <constraint desc="" field="comment" exp=""/>
-              <constraint desc="" field="moveable" exp=""/>
-              <constraint desc="" field="type" exp=""/>
-              <constraint desc="" field="name" exp=""/>
-              <constraint desc="" field="hidden" exp=""/>
-              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
-              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
-              <constraint desc="" field="fence_len" exp=""/>
-              <constraint desc="" field="cone_len" exp=""/>
+              <constraint desc="" exp="" field="id"/>
+              <constraint desc="" exp="" field="group"/>
+              <constraint desc="" exp="" field="comment"/>
+              <constraint desc="" exp="" field="moveable"/>
+              <constraint desc="" exp="" field="type"/>
+              <constraint desc="" exp="" field="name"/>
+              <constraint desc="" exp="" field="hidden"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint desc="" exp="" field="fence_len"/>
+              <constraint desc="" exp="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field precision="0" typeName="double precision" name="fence_len" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" length="-1"/>
-              <field precision="0" typeName="double precision" name="fence_len" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" length="-1"/>
-              <field precision="0" typeName="double precision" name="cone_len" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" length="-1"/>
+              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="cone_len" type="6"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column name="id" width="-1" type="field" hidden="0"/>
-                <column name="group" width="-1" type="field" hidden="0"/>
+                <column width="-1" name="id" type="field" hidden="0"/>
+                <column width="-1" name="group" type="field" hidden="0"/>
                 <column width="-1" type="actions" hidden="1"/>
-                <column name="comment" width="223" type="field" hidden="0"/>
-                <column name="moveable" width="-1" type="field" hidden="0"/>
-                <column name="type" width="-1" type="field" hidden="0"/>
-                <column name="name" width="414" type="field" hidden="0"/>
-                <column name="hidden" width="-1" type="field" hidden="0"/>
-                <column name="fence_len" width="-1" type="field" hidden="0"/>
-                <column name="cone_len" width="-1" type="field" hidden="0"/>
-                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
-                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
+                <column width="223" name="comment" type="field" hidden="0"/>
+                <column width="-1" name="moveable" type="field" hidden="0"/>
+                <column width="-1" name="type" type="field" hidden="0"/>
+                <column width="414" name="name" type="field" hidden="0"/>
+                <column width="-1" name="hidden" type="field" hidden="0"/>
+                <column width="-1" name="fence_len" type="field" hidden="0"/>
+                <column width="-1" name="cone_len" type="field" hidden="0"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" type="field" hidden="1"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" type="field" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8868,13 +8854,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8883,7 +8869,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8891,7 +8877,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
+            <layer enabled="1" id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -8932,7 +8918,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8940,7 +8926,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
+            <layer enabled="1" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -8965,7 +8951,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8973,7 +8959,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
+            <layer enabled="1" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -9006,19 +8992,19 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="1" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0"/>
-            <rule label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1"/>
-            <rule label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2"/>
-            <rule label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3"/>
           </rule>
-          <rule label="Is Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4"/>
-          <rule checkstate="0" label="Always show" key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible" symbol="4"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9026,7 +9012,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
+            <layer enabled="1" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="round" name="capstyle" type="QString"/>
@@ -9071,7 +9057,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9079,7 +9065,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
+            <layer enabled="1" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="round" name="capstyle" type="QString"/>
@@ -9124,7 +9110,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9132,7 +9118,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
+            <layer enabled="1" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9177,7 +9163,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9185,7 +9171,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
+            <layer enabled="1" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9230,7 +9216,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9238,7 +9224,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
+            <layer enabled="1" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9277,7 +9263,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="5" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9285,7 +9271,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
+            <layer enabled="1" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9330,12 +9316,12 @@ def my_form_open(dialog, layer, feature):
         <rules key="{b08c8161-de6f-41d9-a933-40d5428d7db9}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{bc58db75-d3ce-4eaf-8459-5b648cb31e6d}">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="comment" fontWeight="50" legendString="Aa" textOpacity="0.80000000000000004" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="comment" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.59999999999999998" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="1" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderColor="255,255,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9343,7 +9329,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9367,7 +9353,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9388,9 +9374,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="5" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="1" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="5" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9421,7 +9407,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9435,14 +9421,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}" description="Fence lengths">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9450,7 +9436,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9481,7 +9467,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9489,7 +9475,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9513,7 +9499,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9523,9 +9509,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9561,7 +9547,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9575,14 +9561,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}" description="Cones lengths">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9590,7 +9576,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9621,7 +9607,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9629,7 +9615,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9653,7 +9639,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9663,9 +9649,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9701,7 +9687,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9715,14 +9701,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9730,7 +9716,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9761,7 +9747,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9769,7 +9755,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9793,7 +9779,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9803,9 +9789,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9841,7 +9827,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9855,14 +9841,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Always show" filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}">
+          <rule filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}" active="0" description="Always show">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9870,7 +9856,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9901,7 +9887,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9909,7 +9895,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9933,7 +9919,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9943,9 +9929,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9981,7 +9967,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -10014,11 +10000,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -10026,7 +10012,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
+              <layer enabled="1" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -10068,7 +10054,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10077,77 +10063,77 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -10156,16 +10142,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="comment"/>
-        <alias index="3" name="" field="moveable"/>
-        <alias index="4" name="" field="type"/>
-        <alias index="5" name="" field="name"/>
-        <alias index="6" name="" field="hidden"/>
-        <alias index="7" name="" field="day"/>
-        <alias index="8" name="" field="fence_len"/>
-        <alias index="9" name="" field="cone_len"/>
+        <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"/>
@@ -10180,62 +10166,62 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="comment"/>
+        <default expression="" applyOnUpdate="0" field="moveable"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="hidden"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="comment" exp=""/>
-        <constraint desc="" field="moveable" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="hidden" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="fence_len" exp=""/>
-        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="comment"/>
+        <constraint desc="" exp="" field="moveable"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="hidden"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="cone_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" subType="0" length="-1"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column name="id" width="31" type="field" hidden="0"/>
-          <column name="group" width="52" type="field" hidden="0"/>
+          <column width="31" name="id" type="field" hidden="0"/>
+          <column width="52" name="group" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="comment" width="85" type="field" hidden="0"/>
-          <column name="moveable" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="name" width="340" type="field" hidden="0"/>
-          <column name="hidden" width="54" type="field" hidden="0"/>
-          <column name="fence_len" width="74" type="field" hidden="0"/>
-          <column name="day" width="40" type="field" hidden="0"/>
-          <column name="cone_len" width="65" type="field" hidden="0"/>
+          <column width="85" name="comment" type="field" hidden="0"/>
+          <column width="-1" name="moveable" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="340" name="name" type="field" hidden="0"/>
+          <column width="54" name="hidden" type="field" hidden="0"/>
+          <column width="74" name="fence_len" type="field" hidden="0"/>
+          <column width="40" name="day" type="field" hidden="0"/>
+          <column width="65" name="cone_len" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10297,23 +10283,23 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10387,13 +10373,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10402,7 +10388,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10410,7 +10396,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
+            <layer enabled="1" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -10451,7 +10437,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10459,7 +10445,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
+            <layer enabled="1" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -10484,7 +10470,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10492,7 +10478,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
+            <layer enabled="1" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -10525,9 +10511,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10535,7 +10521,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
+            <layer enabled="1" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -10593,11 +10579,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -10605,7 +10591,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
+              <layer enabled="1" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -10647,7 +10633,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10656,14 +10642,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -10672,27 +10658,27 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" exp="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -10736,7 +10722,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10810,13 +10796,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10825,7 +10811,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10833,7 +10819,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
+            <layer enabled="1" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -10874,7 +10860,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10882,7 +10868,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
+            <layer enabled="1" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -10907,7 +10893,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10915,7 +10901,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
+            <layer enabled="1" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -10948,9 +10934,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10958,7 +10944,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
+            <layer enabled="1" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -11011,11 +10997,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -11023,7 +11009,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
+              <layer enabled="1" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -11065,7 +11051,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -11080,14 +11066,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -11097,7 +11083,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -11107,7 +11093,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -11117,7 +11103,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -11126,10 +11112,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <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"/>
@@ -11138,34 +11124,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="page" exp=""/>
-        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="page" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="page" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11212,7 +11198,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11278,7 +11264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11289,7 +11275,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join targetFieldName="position" joinFieldName="position" cascadedDelete="0" hasCustomPrefix="1" customPrefix="csv_" editable="1" memoryCache="0" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="1">
+        <join memoryCache="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" hasCustomPrefix="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" customPrefix="csv_" editable="1">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -11316,13 +11302,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="id" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="id" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -11331,7 +11317,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11339,7 +11325,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
+            <layer enabled="1" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -11380,7 +11366,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11388,7 +11374,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
+            <layer enabled="1" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -11413,7 +11399,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11421,7 +11407,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
+            <layer enabled="1" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11454,14 +11440,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule description="Show in marshal overview" label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0"/>
-          <rule checkstate="0" label="Always show in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1"/>
-          <rule checkstate="0" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" checkstate="0" label="Show by day in marshal plan" description="Show in marshal overview" symbol="0"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" checkstate="0" label="Always show in marshal plan" symbol="1"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11469,7 +11455,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
+            <layer enabled="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11500,7 +11486,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol name="1" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11508,7 +11494,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
+            <layer enabled="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11539,7 +11525,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.01">
+          <symbol name="2" is_animated="0" type="marker" frame_rate="10" alpha="0.01" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11547,7 +11533,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
+            <layer enabled="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11582,14 +11568,14 @@ 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)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11597,7 +11583,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -11628,7 +11614,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11636,7 +11622,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -11666,7 +11652,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -11676,9 +11662,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="1" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="2" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -11714,7 +11700,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -11728,14 +11714,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11743,7 +11729,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -11774,7 +11760,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11782,7 +11768,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -11812,7 +11798,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -11822,9 +11808,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="1" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="2" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -11860,7 +11846,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -11874,14 +11860,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.5" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.5" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11889,7 +11875,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -11919,7 +11905,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -11970,9 +11956,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="5" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12038,7 +12024,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -12052,14 +12038,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="50" legendString="Aa" textOpacity="0.59999999999999998" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.59999999999999998" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12067,7 +12053,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -12098,7 +12084,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12106,7 +12092,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -12136,7 +12122,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -12146,9 +12132,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="5" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12214,7 +12200,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -12228,14 +12214,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.90000000000000002" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12243,7 +12229,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -12274,7 +12260,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12282,7 +12268,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -12312,7 +12298,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -12322,9 +12308,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="10" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12390,7 +12376,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -12414,6 +12400,14 @@ def my_form_open(dialog, layer, feature):
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
           <Option value="0" name="embeddedWidgets/count" type="QString"/>
           <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
@@ -12559,11 +12553,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12571,7 +12565,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}">
+              <layer enabled="1" id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -12613,7 +12607,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -12622,14 +12616,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12639,7 +12633,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12649,7 +12643,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12659,7 +12653,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12669,14 +12663,70 @@ def my_form_open(dialog, layer, feature):
             </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="GROUP">
+        <field name="GROUP" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_day" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_position" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_club" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_captain" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_captain_phone" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_race" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_last_runner" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_instructions" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -12685,12 +12735,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="notes"/>
-        <alias index="4" name="" field="day"/>
-        <alias index="5" name="" field="GROUP"/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="day"/>
+        <alias name="" index="5" field="GROUP"/>
+        <alias name="" index="6" field="csv_day"/>
+        <alias name="" index="7" field="csv_position"/>
+        <alias name="" index="8" field="csv_club"/>
+        <alias name="" index="9" field="csv_captain"/>
+        <alias name="" index="10" field="csv_captain_phone"/>
+        <alias name="" index="11" field="csv_race"/>
+        <alias name="" index="12" field="csv_last_runner"/>
+        <alias name="" index="13" field="csv_instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -12699,44 +12757,84 @@ def my_form_open(dialog, layer, feature):
         <policy field="notes" policy="Duplicate"/>
         <policy field="day" policy="Duplicate"/>
         <policy field="GROUP" policy="Duplicate"/>
+        <policy field="csv_day" policy="Duplicate"/>
+        <policy field="csv_position" policy="Duplicate"/>
+        <policy field="csv_club" policy="Duplicate"/>
+        <policy field="csv_captain" policy="Duplicate"/>
+        <policy field="csv_captain_phone" policy="Duplicate"/>
+        <policy field="csv_race" policy="Duplicate"/>
+        <policy field="csv_last_runner" policy="Duplicate"/>
+        <policy field="csv_instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="GROUP"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="notes"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="GROUP"/>
+        <default expression="" applyOnUpdate="0" field="csv_day"/>
+        <default expression="" applyOnUpdate="0" field="csv_position"/>
+        <default expression="" applyOnUpdate="0" field="csv_club"/>
+        <default expression="" applyOnUpdate="0" field="csv_captain"/>
+        <default expression="" applyOnUpdate="0" field="csv_captain_phone"/>
+        <default expression="" applyOnUpdate="0" field="csv_race"/>
+        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
+        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="notes" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="GROUP" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="GROUP" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain_phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_race" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="position" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="notes" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="GROUP" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="notes"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="GROUP"/>
+        <constraint desc="" exp="" field="csv_day"/>
+        <constraint desc="" exp="" field="csv_position"/>
+        <constraint desc="" exp="" field="csv_club"/>
+        <constraint desc="" exp="" field="csv_captain"/>
+        <constraint desc="" exp="" field="csv_captain_phone"/>
+        <constraint desc="" exp="" field="csv_race"/>
+        <constraint desc="" exp="" field="csv_last_runner"/>
+        <constraint desc="" exp="" field="csv_instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="notes" width="-1" type="field" hidden="0"/>
-          <column name="GROUP" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="position" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="notes" type="field" hidden="0"/>
+          <column width="-1" name="GROUP" type="field" hidden="0"/>
+          <column width="-1" name="csv_day" type="field" hidden="0"/>
+          <column width="-1" name="csv_position" type="field" hidden="0"/>
+          <column width="-1" name="csv_club" type="field" hidden="0"/>
+          <column width="-1" name="csv_captain" type="field" hidden="0"/>
+          <column width="-1" name="csv_captain_phone" type="field" hidden="0"/>
+          <column width="-1" name="csv_race" type="field" hidden="0"/>
+          <column width="-1" name="csv_last_runner" type="field" hidden="0"/>
+          <column width="-1" name="csv_instructions" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12862,38 +12960,38 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" labelOnTop="0"/>
       </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>
@@ -12943,65 +13041,65 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer readOnly="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="No geometry" legendPlaceholderImage="" maxScale="100000" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="1e+08" wkbType="NoGeometry">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" geometry="No geometry" type="vector" readOnly="0" refreshOnNotifyEnabled="0" 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>
-        <value/>
+        <value></value>
       </keywordList>
       <layername>marshals_by_position</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
-          <wkt/>
-          <proj4/>
+          <wkt></wkt>
+          <proj4></proj4>
           <srsid>0</srsid>
           <srid>0</srid>
-          <authid/>
-          <description/>
-          <projectionacronym/>
-          <ellipsoidacronym/>
+          <authid></authid>
+          <description></description>
+          <projectionacronym></projectionacronym>
+          <ellipsoidacronym></ellipsoidacronym>
           <geographicflag>false</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
-        <identifier/>
-        <parentidentifier/>
-        <language/>
-        <type/>
-        <title/>
-        <abstract/>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
         <contact>
-          <name/>
-          <organization/>
-          <position/>
-          <voice/>
-          <fax/>
-          <email/>
-          <role/>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
         </contact>
         <links/>
         <dates/>
-        <fees/>
-        <encoding/>
+        <fees></fees>
+        <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt/>
-            <proj4/>
+            <wkt></wkt>
+            <proj4></proj4>
             <srsid>0</srsid>
             <srid>0</srid>
-            <authid/>
-            <description/>
-            <projectionacronym/>
-            <ellipsoidacronym/>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
-              <start/>
-              <end/>
+              <start></start>
+              <end></end>
             </period>
           </temporal>
         </extent>
@@ -13022,13 +13120,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
-          <start/>
-          <end/>
+          <start></start>
+          <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" type="IndividualFeatures" zoffset="0" extrusion="0" clamping="Terrain" binding="Centroid" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -13037,7 +13135,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13045,7 +13143,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
+            <layer enabled="1" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -13086,7 +13184,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13094,7 +13192,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
+            <layer enabled="1" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -13119,7 +13217,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13127,7 +13225,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
+            <layer enabled="1" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -13173,21 +13271,21 @@ def my_form_open(dialog, layer, feature):
           <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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">
@@ -13197,21 +13295,21 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -13221,21 +13319,21 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -13245,35 +13343,35 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -13282,19 +13380,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="day"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="first_name"/>
-        <alias index="3" name="" field="surname"/>
-        <alias index="4" name="" field="club"/>
-        <alias index="5" name="" field="phone"/>
-        <alias index="6" name="" field="email"/>
-        <alias index="7" name="" field="captain"/>
-        <alias index="8" name="" field="captain_phone"/>
-        <alias index="9" name="" field="race"/>
-        <alias index="10" name="" field="first_runner"/>
-        <alias index="11" name="" field="last_runner"/>
-        <alias index="12" name="" field="instructions"/>
+        <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"/>
@@ -13312,70 +13410,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="first_name"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="race"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="first_name"/>
+        <default expression="" applyOnUpdate="0" field="surname"/>
+        <default expression="" applyOnUpdate="0" field="club"/>
+        <default expression="" applyOnUpdate="0" field="phone"/>
+        <default expression="" applyOnUpdate="0" field="email"/>
+        <default expression="" applyOnUpdate="0" field="captain"/>
+        <default expression="" applyOnUpdate="0" field="captain_phone"/>
+        <default expression="" applyOnUpdate="0" field="race"/>
+        <default expression="" applyOnUpdate="0" field="first_runner"/>
+        <default expression="" applyOnUpdate="0" field="last_runner"/>
+        <default expression="" applyOnUpdate="0" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="surname" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="club" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="phone" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="email" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain_phone" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="race" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runner" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runner" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="instructions" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="surname" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain_phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="race" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="position" exp=""/>
-        <constraint desc="" field="first_name" exp=""/>
-        <constraint desc="" field="surname" exp=""/>
-        <constraint desc="" field="club" exp=""/>
-        <constraint desc="" field="phone" exp=""/>
-        <constraint desc="" field="email" exp=""/>
-        <constraint desc="" field="captain" exp=""/>
-        <constraint desc="" field="captain_phone" exp=""/>
-        <constraint desc="" field="race" exp=""/>
-        <constraint desc="" field="first_runner" exp=""/>
-        <constraint desc="" field="last_runner" exp=""/>
-        <constraint desc="" field="instructions" exp=""/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="first_name"/>
+        <constraint desc="" exp="" field="surname"/>
+        <constraint desc="" exp="" field="club"/>
+        <constraint desc="" exp="" field="phone"/>
+        <constraint desc="" exp="" field="email"/>
+        <constraint desc="" exp="" field="captain"/>
+        <constraint desc="" exp="" field="captain_phone"/>
+        <constraint desc="" exp="" field="race"/>
+        <constraint desc="" exp="" field="first_runner"/>
+        <constraint desc="" exp="" field="last_runner"/>
+        <constraint desc="" exp="" field="instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="club" width="-1" type="field" hidden="0"/>
-          <column name="phone" width="-1" type="field" hidden="0"/>
-          <column name="email" width="-1" type="field" hidden="0"/>
-          <column name="captain" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="position" type="field" hidden="0"/>
+          <column width="-1" name="club" type="field" hidden="0"/>
+          <column width="-1" name="phone" type="field" hidden="0"/>
+          <column width="-1" name="email" type="field" hidden="0"/>
+          <column width="-1" name="captain" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="first_runner" width="-1" type="field" hidden="0"/>
-          <column name="last_runner" width="-1" type="field" hidden="0"/>
-          <column name="instructions" width="-1" type="field" hidden="0"/>
-          <column name="surname" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="first_name" width="-1" type="field" hidden="0"/>
-          <column name="race" width="-1" type="field" hidden="0"/>
-          <column name="captain_phone" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="first_runner" type="field" hidden="0"/>
+          <column width="-1" name="last_runner" type="field" hidden="0"/>
+          <column width="-1" name="instructions" type="field" hidden="0"/>
+          <column width="-1" name="surname" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="first_name" type="field" hidden="0"/>
+          <column width="-1" name="race" type="field" hidden="0"/>
+          <column width="-1" name="captain_phone" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13455,28 +13553,28 @@ def my_form_open(dialog, layer, feature):
         <field name="tshirt" labelOnTop="0"/>
       </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"/>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13542,7 +13640,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13567,13 +13665,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -13582,7 +13680,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13590,7 +13688,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
+            <layer enabled="1" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -13631,7 +13729,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13639,7 +13737,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
+            <layer enabled="1" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -13664,7 +13762,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13672,7 +13770,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
+            <layer enabled="1" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -13705,13 +13803,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13719,7 +13817,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}">
+            <layer enabled="1" id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -13758,7 +13856,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13766,7 +13864,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
+            <layer enabled="1" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -13804,7 +13902,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
+            <layer enabled="1" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -13830,7 +13928,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -13838,7 +13936,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
+                <layer enabled="1" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -13860,7 +13958,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -13868,7 +13966,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
+                    <layer enabled="1" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -13912,11 +14010,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -13924,7 +14022,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
+              <layer enabled="1" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -13966,7 +14064,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -13975,21 +14073,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -13998,34 +14096,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14070,7 +14168,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14136,7 +14234,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14161,13 +14259,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -14176,7 +14274,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14184,7 +14282,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
+            <layer enabled="1" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -14225,7 +14323,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14233,7 +14331,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
+            <layer enabled="1" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -14258,7 +14356,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14266,7 +14364,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
+            <layer enabled="1" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -14299,15 +14397,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="name" fontWeight="50" legendString="Aa" textOpacity="0.75" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8.5" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="8.5" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.75" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1.5" bufferDraw="1" bufferNoFill="0"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -14315,7 +14413,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -14339,7 +14437,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14370,9 +14468,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="2" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="1" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="0" dist="0" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+          <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="1" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -14413,7 +14511,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -14442,11 +14540,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -14454,7 +14552,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
+              <layer enabled="1" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -14496,7 +14594,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -14505,14 +14603,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14522,7 +14620,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14532,7 +14630,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14542,7 +14640,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14552,7 +14650,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14562,7 +14660,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14572,7 +14670,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14582,7 +14680,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14592,7 +14690,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14604,15 +14702,15 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="osm_id"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="type"/>
-        <alias index="4" name="" field="z_order"/>
-        <alias index="5" name="" field="population"/>
-        <alias index="6" name="" field="label_x"/>
-        <alias index="7" name="" field="label_y"/>
-        <alias index="8" name="" field="label_rota"/>
+        <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"/>
@@ -14626,54 +14724,54 @@ def my_form_open(dialog, layer, feature):
         <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="population"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="population" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="osm_id" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="z_order" exp=""/>
-        <constraint desc="" field="population" exp=""/>
-        <constraint desc="" field="label_x" exp=""/>
-        <constraint desc="" field="label_y" exp=""/>
-        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="population"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
-          <column name="population" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="osm_id" type="field" hidden="0"/>
+          <column width="-1" name="name" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="z_order" type="field" hidden="0"/>
+          <column width="-1" name="population" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="label_x" type="field" hidden="0"/>
+          <column width="-1" name="label_y" type="field" hidden="0"/>
+          <column width="-1" name="label_rota" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14732,7 +14830,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14798,7 +14896,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14823,13 +14921,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -14838,7 +14936,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14846,7 +14944,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
+            <layer enabled="1" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -14887,7 +14985,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14895,7 +14993,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
+            <layer enabled="1" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -14920,7 +15018,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14928,7 +15026,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
+            <layer enabled="1" id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -14961,15 +15059,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" legendString="Aa" textOpacity="0.80000000000000004" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="7" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontItalic="0" fontSize="7" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="0"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -14977,7 +15075,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -15008,7 +15106,7 @@ def my_form_open(dialog, layer, feature):
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -15016,7 +15114,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -15040,7 +15138,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15050,9 +15148,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="4" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="3" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="0" dist="0" layerType="LineGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="3" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MapUnit" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="1" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="5" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+          <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="3" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="3" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="5" obstacle="1" mergeLines="1" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -15113,7 +15211,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -15144,11 +15242,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -15156,7 +15254,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
+              <layer enabled="1" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -15198,7 +15296,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -15207,14 +15305,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -15224,7 +15322,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -15234,42 +15332,42 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -15279,56 +15377,56 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -15337,22 +15435,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="osm_id"/>
-        <alias index="1" name="" field="name"/>
-        <alias index="2" name="" field="highway"/>
-        <alias index="3" name="" field="waterway"/>
-        <alias index="4" name="" field="aerialway"/>
-        <alias index="5" name="" field="barrier"/>
-        <alias index="6" name="" field="man_made"/>
-        <alias index="7" name="" field="z_order"/>
-        <alias index="8" name="" field="other_tags"/>
-        <alias index="9" name="" field="never_show"/>
-        <alias index="10" name="" field="label_x"/>
-        <alias index="11" name="" field="label_y"/>
-        <alias index="12" name="" field="label_rota"/>
-        <alias index="13" name="" field="always_sho"/>
-        <alias index="14" name="" field="resident_a"/>
-        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
+        <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"/>
@@ -15373,82 +15471,82 @@ def my_form_open(dialog, layer, feature):
         <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="highway"/>
+        <default expression="" applyOnUpdate="0" field="waterway"/>
+        <default expression="" applyOnUpdate="0" field="aerialway"/>
+        <default expression="" applyOnUpdate="0" field="barrier"/>
+        <default expression="" applyOnUpdate="0" field="man_made"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="other_tags"/>
+        <default expression="" applyOnUpdate="0" field="never_show"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
+        <default expression="" applyOnUpdate="0" field="always_sho"/>
+        <default expression="" applyOnUpdate="0" field="resident_a"/>
+        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="highway" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="waterway" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="aerialway" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="barrier" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="man_made" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="other_tags" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="never_show" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="always_sho" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="resident_a" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_show" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="osm_id" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="highway" exp=""/>
-        <constraint desc="" field="waterway" exp=""/>
-        <constraint desc="" field="aerialway" exp=""/>
-        <constraint desc="" field="barrier" exp=""/>
-        <constraint desc="" field="man_made" exp=""/>
-        <constraint desc="" field="z_order" exp=""/>
-        <constraint desc="" field="other_tags" exp=""/>
-        <constraint desc="" field="never_show" exp=""/>
-        <constraint desc="" field="label_x" exp=""/>
-        <constraint desc="" field="label_y" exp=""/>
-        <constraint desc="" field="label_rota" exp=""/>
-        <constraint desc="" field="always_sho" exp=""/>
-        <constraint desc="" field="resident_a" exp=""/>
-        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="highway"/>
+        <constraint desc="" exp="" field="waterway"/>
+        <constraint desc="" exp="" field="aerialway"/>
+        <constraint desc="" exp="" field="barrier"/>
+        <constraint desc="" exp="" field="man_made"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="other_tags"/>
+        <constraint desc="" exp="" field="never_show"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
+        <constraint desc="" exp="" field="always_sho"/>
+        <constraint desc="" exp="" field="resident_a"/>
+        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="160" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="osm_id" type="field" hidden="0"/>
+          <column width="160" name="name" type="field" hidden="0"/>
+          <column width="-1" name="z_order" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="highway" width="-1" type="field" hidden="0"/>
-          <column name="waterway" width="-1" type="field" hidden="0"/>
-          <column name="aerialway" width="-1" type="field" hidden="0"/>
-          <column name="barrier" width="-1" type="field" hidden="0"/>
-          <column name="man_made" width="-1" type="field" hidden="0"/>
-          <column name="other_tags" width="175" type="field" hidden="0"/>
-          <column name="never_show" width="-1" type="field" hidden="0"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
-          <column name="always_sho" width="-1" type="field" hidden="0"/>
-          <column name="resident_a" width="-1" type="field" hidden="0"/>
-          <column name="auxiliary_storage_labeling_show" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="highway" type="field" hidden="0"/>
+          <column width="-1" name="waterway" type="field" hidden="0"/>
+          <column width="-1" name="aerialway" type="field" hidden="0"/>
+          <column width="-1" name="barrier" type="field" hidden="0"/>
+          <column width="-1" name="man_made" type="field" hidden="0"/>
+          <column width="175" name="other_tags" type="field" hidden="0"/>
+          <column width="-1" name="never_show" type="field" hidden="0"/>
+          <column width="-1" name="label_x" type="field" hidden="0"/>
+          <column width="-1" name="label_y" type="field" hidden="0"/>
+          <column width="-1" name="label_rota" type="field" hidden="0"/>
+          <column width="-1" name="always_sho" type="field" hidden="0"/>
+          <column width="-1" name="resident_a" type="field" hidden="0"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15552,22 +15650,22 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" labelOnTop="0"/>
       </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>
@@ -15617,7 +15715,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15683,7 +15781,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15708,13 +15806,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -15723,7 +15821,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15731,7 +15829,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
+            <layer enabled="1" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -15772,7 +15870,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15780,7 +15878,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
+            <layer enabled="1" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -15805,7 +15903,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15813,7 +15911,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
+            <layer enabled="1" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -15846,7 +15944,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
           <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
@@ -15856,7 +15954,7 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15864,7 +15962,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
+            <layer enabled="1" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -15901,7 +15999,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15909,7 +16007,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
+            <layer enabled="1" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="0,32,80,255" name="color" type="QString"/>
@@ -15945,7 +16043,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15953,7 +16051,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
+            <layer enabled="1" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="0,0,0,255" name="color" type="QString"/>
@@ -15999,7 +16097,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16007,7 +16105,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
+            <layer enabled="1" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="125,139,143,255" name="color" type="QString"/>
@@ -16043,7 +16141,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16051,7 +16149,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
+            <layer enabled="1" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="0,12,254,255" name="color" type="QString"/>
@@ -16173,7 +16271,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="5" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16181,7 +16279,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
+            <layer enabled="1" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="43,153,41,255" name="color" type="QString"/>
@@ -16221,12 +16319,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="name" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="0.80000000000000004" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="2" bufferDraw="1" bufferNoFill="0"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="1" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="2" shapeRadiiY="2">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="2" shapeType="0" shapeRadiiY="2" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.69999999999999996" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -16234,7 +16332,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -16258,7 +16356,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16284,9 +16382,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="2" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="3" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="2" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="3" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="10" scaleMax="0"/>
+          <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="3" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="3"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -16322,7 +16420,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -16351,11 +16449,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -16363,7 +16461,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
+              <layer enabled="1" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -16405,7 +16503,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -16414,35 +16512,35 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -16451,10 +16549,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="distance"/>
+        <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"/>
@@ -16463,34 +16561,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="name" type="field" hidden="0"/>
+          <column width="-1" name="distance" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16539,7 +16637,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16613,13 +16711,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -16628,7 +16726,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16636,7 +16734,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
+            <layer enabled="1" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -16677,7 +16775,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16685,7 +16783,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
+            <layer enabled="1" id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -16710,7 +16808,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16718,7 +16816,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
+            <layer enabled="1" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -16751,9 +16849,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16761,7 +16859,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
+            <layer enabled="1" id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" pass="0" class="LinePatternFill">
               <Option type="Map">
                 <Option value="135" name="angle" type="QString"/>
                 <Option value="during_render" name="clip_mode" type="QString"/>
@@ -16786,7 +16884,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+              <symbol name="@0@0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -16794,7 +16892,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
+                <layer enabled="1" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" pass="0" class="SimpleLine">
                   <Option type="Map">
                     <Option value="0" name="align_dash_pattern" type="QString"/>
                     <Option value="square" name="capstyle" type="QString"/>
@@ -16834,7 +16932,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
+            <layer enabled="1" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -16876,11 +16974,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -16888,7 +16986,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
+              <layer enabled="1" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -16930,7 +17028,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -16939,14 +17037,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16955,28 +17053,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default expression="" applyOnUpdate="0" field="FID"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="FID" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="FID" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="FID" exp=""/>
+        <constraint desc="" exp="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="431" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="431" name="type" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -17022,7 +17120,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17088,7 +17186,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17113,13 +17211,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -17128,7 +17226,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17136,7 +17234,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
+            <layer enabled="1" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17177,7 +17275,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17185,7 +17283,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
+            <layer enabled="1" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -17210,7 +17308,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17218,7 +17316,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
+            <layer enabled="1" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -17251,16 +17349,16 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0"/>
-          <rule label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1"/>
-          <rule label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2"/>
-          <rule label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3"/>
-          <rule label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17268,7 +17366,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
+            <layer enabled="1" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17318,7 +17416,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17326,7 +17424,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
+            <layer enabled="1" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -17352,7 +17450,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17360,7 +17458,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
+                <layer enabled="1" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -17393,7 +17491,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17401,7 +17499,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
+            <layer enabled="1" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17450,7 +17548,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
+            <layer enabled="1" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -17482,7 +17580,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17490,7 +17588,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
+                <layer enabled="1" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -17529,7 +17627,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17537,7 +17635,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}">
+            <layer enabled="1" id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17586,7 +17684,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
+            <layer enabled="1" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -17618,7 +17716,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17626,7 +17724,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}">
+                <layer enabled="1" id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -17665,7 +17763,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17673,7 +17771,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
+            <layer enabled="1" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17727,12 +17825,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="times" fontWeight="50" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="times" fontItalic="0" fontSize="9" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17740,7 +17838,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -17764,7 +17862,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17774,9 +17872,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="0" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+          <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -17796,7 +17894,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -17825,11 +17923,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -17837,7 +17935,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}">
+              <layer enabled="1" id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -17879,7 +17977,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -17888,35 +17986,35 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -17925,10 +18023,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="status"/>
-        <alias index="3" name="" field="times"/>
+        <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"/>
@@ -17937,34 +18035,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" field="times"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="status"/>
+        <default expression="" applyOnUpdate="0" field="times"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="status" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="times" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="status" exp=""/>
-        <constraint desc="" field="times" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="status"/>
+        <constraint desc="" exp="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="202" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="202" name="type" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="status" width="-1" type="field" hidden="0"/>
-          <column name="times" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="status" type="field" hidden="0"/>
+          <column width="-1" name="times" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18013,7 +18111,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37579747691996346</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -18087,13 +18185,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -18102,7 +18200,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -18110,7 +18208,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
+            <layer enabled="1" id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -18151,7 +18249,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -18159,7 +18257,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+            <layer enabled="1" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -18184,7 +18282,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -18192,7 +18290,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+            <layer enabled="1" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -18225,17 +18323,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
+          <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; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18243,7 +18341,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -18274,7 +18372,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18282,7 +18380,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -18317,7 +18415,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18327,9 +18425,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -18380,7 +18478,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18394,14 +18492,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18409,7 +18507,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -18440,7 +18538,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18448,7 +18546,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -18483,7 +18581,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18493,9 +18591,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -18546,7 +18644,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18560,15 +18658,15 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" description="21KM" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" description="List for legends">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" description="21KM">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeOffsetX="0">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18576,7 +18674,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -18600,7 +18698,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -18631,9 +18729,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18674,7 +18772,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18688,14 +18786,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule active="0" description="10KM" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" description="10KM">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeOffsetX="0">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18703,7 +18801,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -18727,7 +18825,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -18758,9 +18856,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18801,7 +18899,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18815,14 +18913,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule active="0" description="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" description="5KM">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
+                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18830,7 +18928,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                         <Option type="Map">
                           <Option value="0" name="angle" type="QString"/>
                           <Option value="square" name="cap_style" type="QString"/>
@@ -18861,7 +18959,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18869,7 +18967,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -18893,7 +18991,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -18903,9 +19001,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18946,7 +19044,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18960,14 +19058,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" description="Trail">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
+                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18975,7 +19073,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                         <Option type="Map">
                           <Option value="0" name="angle" type="QString"/>
                           <Option value="square" name="cap_style" type="QString"/>
@@ -19006,7 +19104,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -19014,7 +19112,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -19038,7 +19136,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -19048,9 +19146,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -19091,7 +19189,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -19125,11 +19223,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -19137,7 +19235,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+              <layer enabled="1" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -19179,7 +19277,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -19188,14 +19286,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19205,7 +19303,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19215,7 +19313,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19225,7 +19323,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19235,7 +19333,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19245,21 +19343,21 @@ def my_form_open(dialog, layer, feature):
             </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="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19269,7 +19367,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19279,7 +19377,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19289,7 +19387,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19299,7 +19397,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19311,18 +19409,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="begin"/>
-        <alias index="2" name="" field="end"/>
-        <alias index="3" name="" field="Distance"/>
-        <alias index="4" name="" field="RouteLen"/>
-        <alias index="5" name="" field="Sort"/>
-        <alias index="6" name="" field="day"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="length_m"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
+        <alias name="" index="10" field="org_fid"/>
+        <alias name="" index="11" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -19339,66 +19437,66 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <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="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <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 expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="org_fid" type="field" hidden="0"/>
+          <column width="-1" name="distance" type="field" hidden="0"/>
+          <column width="-1" name="Name" type="field" hidden="0"/>
+          <column width="-1" name="Source" type="field" hidden="0"/>
+          <column width="-1" name="RouteLen" type="field" hidden="0"/>
+          <column width="-1" name="begin" type="field" hidden="0"/>
+          <column width="-1" name="end" type="field" hidden="0"/>
+          <column width="-1" name="Distance" type="field" hidden="0"/>
+          <column width="-1" name="length_km" type="field" hidden="0"/>
+          <column width="-1" name="Sort" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="length_m" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19464,1515 +19562,28 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
-      <extent>
-        <xmin>18.37568387427754857</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.9003177544488068</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37568387427754857</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.9003177544488068</ymax>
-      </wgs84extent>
-      <id>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <dates/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option value="" name="name" type="QString"/>
-            <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
-              <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>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
-              <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>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
-              <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>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
-      <labeling type="rule-based">
-        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
-            <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <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>
-                            <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>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </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="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-              </callout>
-            </settings>
-          </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
-            <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <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>
-                            <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>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </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="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-              </callout>
-            </settings>
-          </rule>
-          <rule active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" description="21KM" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <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>
-                        <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>
-                        <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>
-                        <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>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" description="10KM" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <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>
-                        <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>
-                        <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>
-                        <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>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" description="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </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="dualview/previewExpressions" type="List">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
-          </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
-          <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
-                <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>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
-        <properties>
-          <Option type="Map">
-            <Option value="" name="name" type="QString"/>
-            <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="begin">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="end">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="Distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="RouteLen">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="Sort">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="day">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="Source">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="length_km">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="length_m">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="org_fid">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="quadrant">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="begin"/>
-        <alias index="2" name="" field="end"/>
-        <alias index="3" name="" field="Distance"/>
-        <alias index="4" name="" field="RouteLen"/>
-        <alias index="5" name="" field="Sort"/>
-        <alias index="6" name="" field="day"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="length_m"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
-        <alias index="12" name="" field="quadrant"/>
-      </aliases>
-      <splitPolicies>
-        <policy field="Name" policy="Duplicate"/>
-        <policy field="begin" policy="Duplicate"/>
-        <policy field="end" policy="Duplicate"/>
-        <policy field="Distance" policy="Duplicate"/>
-        <policy field="RouteLen" policy="Duplicate"/>
-        <policy field="Sort" policy="Duplicate"/>
-        <policy field="day" policy="Duplicate"/>
-        <policy field="Source" policy="Duplicate"/>
-        <policy field="length_km" policy="Duplicate"/>
-        <policy field="length_m" policy="Duplicate"/>
-        <policy field="org_fid" policy="Duplicate"/>
-        <policy field="distance" policy="Duplicate"/>
-        <policy field="quadrant" policy="Duplicate"/>
-      </splitPolicies>
-      <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <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="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <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 notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="quadrant" unique_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
-        <constraint desc="" field="quadrant" exp=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
-        <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="quadrant" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
-      </labelOnTop>
-      <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip enabled="1">Text</mapTip>
-    </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21046,13 +19657,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -21061,7 +19672,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21069,7 +19680,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
+            <layer enabled="1" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -21110,7 +19721,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21118,7 +19729,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
+            <layer enabled="1" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -21143,7 +19754,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21151,7 +19762,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
+            <layer enabled="1" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -21184,9 +19795,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21194,7 +19805,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
+            <layer enabled="1" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -21232,30 +19843,30 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -21264,9 +19875,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="area"/>
-        <alias index="2" name="" field="rotation"/>
+        <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"/>
@@ -21274,29 +19885,29 @@ def my_form_open(dialog, layer, feature):
         <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" field="rotation"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="area"/>
+        <default expression="" applyOnUpdate="0" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="area" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="area" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="rotation" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="area" exp=""/>
-        <constraint desc="" field="rotation" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="area"/>
+        <constraint desc="" exp="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="area" width="-1" type="field" hidden="0"/>
-          <column name="rotation" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="area" type="field" hidden="0"/>
+          <column width="-1" name="rotation" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -21320,21 +19931,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse</datasource>
+      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000'</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21386,7 +19997,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21411,13 +20022,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -21426,7 +20037,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21434,7 +20045,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
+            <layer enabled="1" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -21475,7 +20086,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21483,7 +20094,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
+            <layer enabled="1" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -21508,7 +20119,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21516,7 +20127,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
+            <layer enabled="1" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -21549,12 +20160,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0" label="All distances" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21562,7 +20173,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" enabled="1" class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
+            <layer enabled="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -21628,11 +20239,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -21640,7 +20251,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
+              <layer enabled="1" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -21682,7 +20293,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -21691,35 +20302,35 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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">
@@ -21729,14 +20340,14 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -21746,7 +20357,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21756,42 +20367,42 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -21800,19 +20411,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="RouteLen"/>
-        <alias index="6" name="" field="Source"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="org_fid"/>
-        <alias index="10" name="" field="distance"/>
-        <alias index="11" name="" field="first_runn"/>
-        <alias index="12" name="" field="last_runne"/>
+        <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"/>
@@ -21830,70 +20441,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="first_runn"/>
-        <default applyOnUpdate="0" expression="" field="last_runne"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="first_runn"/>
+        <default expression="" applyOnUpdate="0" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="descriptio" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="timestamp" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runn" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runne" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_runn" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_runne" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="descriptio" exp=""/>
-        <constraint desc="" field="timestamp" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
-        <constraint desc="" field="first_runn" exp=""/>
-        <constraint desc="" field="last_runne" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" exp="" field="first_runn"/>
+        <constraint desc="" exp="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column name="begin" width="179" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column width="179" name="begin" type="field" hidden="0"/>
+          <column width="-1" name="RouteLen" type="field" hidden="0"/>
+          <column width="-1" name="Source" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="first_runn" width="-1" type="field" hidden="0"/>
-          <column name="last_runne" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="Name" type="field" hidden="0"/>
+          <column width="-1" name="length_m" type="field" hidden="0"/>
+          <column width="-1" name="length_km" type="field" hidden="0"/>
+          <column width="-1" name="org_fid" type="field" hidden="0"/>
+          <column width="-1" name="first_runn" type="field" hidden="0"/>
+          <column width="-1" name="last_runne" type="field" hidden="0"/>
+          <column width="-1" name="descriptio" type="field" hidden="0"/>
+          <column width="-1" name="timestamp" type="field" hidden="0"/>
+          <column width="-1" name="end" type="field" hidden="0"/>
+          <column width="-1" name="distance" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21984,7 +20595,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22058,13 +20669,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22073,7 +20684,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22081,7 +20692,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
+            <layer enabled="1" id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -22122,7 +20733,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22130,7 +20741,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
+            <layer enabled="1" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -22155,7 +20766,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22163,7 +20774,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
+            <layer enabled="1" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -22196,13 +20807,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22210,7 +20821,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
+            <layer enabled="1" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -22249,7 +20860,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22257,7 +20868,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
+            <layer enabled="1" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -22295,7 +20906,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
+            <layer enabled="1" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -22321,7 +20932,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -22329,7 +20940,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
+                <layer enabled="1" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -22351,7 +20962,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -22359,7 +20970,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
+                    <layer enabled="1" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -22403,11 +21014,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -22415,7 +21026,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
+              <layer enabled="1" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -22457,7 +21068,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22466,21 +21077,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -22489,34 +21100,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22561,7 +21172,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22635,13 +21246,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22650,7 +21261,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22658,7 +21269,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
+            <layer enabled="1" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -22699,7 +21310,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22707,7 +21318,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
+            <layer enabled="1" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -22732,7 +21343,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22740,7 +21351,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
+            <layer enabled="1" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -22773,15 +21384,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="label" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="15" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="15" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -22789,7 +21400,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -22813,7 +21424,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22823,9 +21434,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="0" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+          <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -22845,7 +21456,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -22873,11 +21484,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -22885,7 +21496,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
+              <layer enabled="1" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -22927,7 +21538,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22936,21 +21547,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -22959,33 +21570,33 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="label"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="label" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -23031,7 +21642,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23097,7 +21708,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23122,13 +21733,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -23137,7 +21748,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -23145,7 +21756,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
+            <layer enabled="1" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -23186,7 +21797,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -23194,7 +21805,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
+            <layer enabled="1" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -23219,7 +21830,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -23227,7 +21838,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
+            <layer enabled="1" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -23260,17 +21871,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <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" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="31,120,180,255" textOrientation="horizontal" fieldName="label" fontWeight="75" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Bold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Bold" fontWeight="75" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="8" textColor="31,120,180,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="0.40000000000000002" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.75" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.75" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.29999999999999999" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeOffsetY="-0.14999999999999999" shapeBorderColor="31,120,206,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0.5" shapeRadiiY="0.5">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0.5" shapeType="0" shapeRadiiY="0.5" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.75" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -23278,7 +21889,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -23309,7 +21920,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -23317,7 +21928,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -23341,7 +21952,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -23351,9 +21962,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="1" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="1" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="0" layerType="PolygonGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="1" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="6" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="5" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PolygonGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="1" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="6" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -23373,7 +21984,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -23410,11 +22021,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -23422,7 +22033,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
+              <layer enabled="1" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -23464,7 +22075,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -23473,7 +22084,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -23483,10 +22094,10 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -23496,7 +22107,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -23506,7 +22117,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -23516,14 +22127,14 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -23532,11 +22143,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="table_set"/>
-        <alias index="2" name="" field="label"/>
-        <alias index="3" name="" field="races"/>
-        <alias index="4" name="" field="day"/>
+        <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"/>
@@ -23546,38 +22157,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="table_set"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
+        <default expression="" applyOnUpdate="0" field="races"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="table_set" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="races" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="table_set" exp=""/>
-        <constraint desc="" field="label" exp=""/>
-        <constraint desc="" field="races" exp=""/>
-        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="table_set"/>
+        <constraint desc="" exp="" field="label"/>
+        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="table_set" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="races" width="130" type="field" hidden="0"/>
+          <column width="-1" name="table_set" type="field" hidden="0"/>
+          <column width="-1" name="label" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="130" name="races" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23623,11 +22234,11 @@ def my_form_open(dialog, layer, feature):
         <field name="table_set" labelOnTop="0"/>
       </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/>
@@ -23662,7 +22273,6 @@ def my_form_open(dialog, layer, feature):
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
     <layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
-    <layer id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
     <layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
   </layerorder>
   <properties>
@@ -24008,311 +22618,312 @@ def my_form_open(dialog, layer, feature):
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" visible="1"/>
+      <layer style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" visible="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" visible="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Fencing" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default" visible="1"/>
+    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
       <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <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="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - inset" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
+    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <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-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - main" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
+    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <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-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal plan" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <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="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
         <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="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <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="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="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 style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="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 style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" visible="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -24343,11 +22954,11 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" name="Marshals" worldFileMap="" units="mm">
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -24355,7 +22966,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
+          <layer enabled="1" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -24378,9 +22989,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -24393,7 +23004,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -24401,7 +23012,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
+            <layer enabled="1" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -24427,9 +23038,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" sectionWidth="132.391" type="65647" excludeFromExports="0" zValue="6" referencePoint="0" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" positionLock="true" sectionY="0" visibility="1" frame="false" position="158.226,6.0007,mm" positionOnPage="158.226,6.0007,mm" sectionHeight="184.8" size="132.391,187.018,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="158.226,6.0007,mm" visibility="1" position="158.226,6.0007,mm" itemRotation="0" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" id="" size="132.391,187.018,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="6" sectionWidth="132.391" frame="false" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionY="0" background="false" excludeFromExports="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionHeight="187.018">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24443,9 +23054,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="5" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="128.508,3.98741,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.1,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="true" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="128.508,3.98741,mm" size="20.4703,32.2333,mm" columnCount="1" titleAlignment="1" frameJoinStyle="bevel" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="128" green="128" red="128" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="128.508,3.98741,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="bevel" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" itemRotation="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.1,mm" title="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="20.4703,32.2333,mm" id="" symbolHeight="4" zValue="5">
+        <FrameColor blue="128" red="128" green="128" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24462,13 +23073,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24476,7 +23087,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24500,7 +23111,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24510,13 +23121,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.8805579999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.8805579999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24524,7 +23135,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24548,7 +23159,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24558,13 +23169,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="1" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.1750019999999992" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="1">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.1750019999999992" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24572,7 +23183,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24596,7 +23207,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24606,13 +23217,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24620,7 +23231,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24644,7 +23255,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24654,13 +23265,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="3.8222239999999998" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="8" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="3.8222239999999998" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24668,7 +23279,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24692,7 +23303,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24707,11 +23318,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -24725,9 +23336,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="3" referencePoint="0" keepLayerSet="false" outlineWidthM="0.2,mm" groupUuid="" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="98.7828,149.027,mm" drawCanvasItems="false" positionOnPage="98.7828,149.027,mm" mapFlags="0" size="56.5192,54.5647,mm" background="true" id="Inset map" itemRotation="0" mapRotation="0" followPresetName="Marshal map - inset" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.2,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="98.7828,149.027,mm" visibility="1" followPreset="true" position="98.7828,149.027,mm" itemRotation="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" size="56.5192,54.5647,mm" frameJoinStyle="miter" blendMode="0" zValue="3" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - inset" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24740,11 +23351,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90659215121308279" ymin="-33.91073582826823696" xmin="18.3917833749645645" xmax="18.39607548048533303"/>
+        <Extent xmax="18.41126562861851212" xmin="18.40697388772057153" ymax="-33.9017837760004852" ymin="-33.90592710104210994"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24752,7 +23363,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
+              <layer enabled="1" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -24793,7 +23404,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24801,7 +23412,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
+              <layer enabled="1" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -24833,12 +23444,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -24846,7 +23457,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -24870,7 +23481,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -24892,8 +23503,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" show="1" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" inverted="0">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -24901,7 +23512,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
+            <layer enabled="1" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -24937,16 +23548,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="2" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="3.53,6.0007,mm" drawCanvasItems="false" positionOnPage="3.53,6.0007,mm" mapFlags="0" size="142,187.018,mm" background="false" id="Main map" itemRotation="0" mapRotation="0" followPresetName="Marshal map - main" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.53,6.0007,mm" visibility="1" followPreset="true" position="3.53,6.0007,mm" itemRotation="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" size="142,187.018,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - main" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24959,11 +23570,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90798769129818879" ymin="-33.90934028818313095" xmin="18.39341592405077463" xmax="18.3944429313991229"/>
+        <Extent xmax="18.40963321822056642" xmin="18.40860629811851723" ymax="-33.90317919753172049" ymin="-33.90453167951087465"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24971,7 +23582,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
+              <layer enabled="1" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -25012,7 +23623,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25020,7 +23631,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
+              <layer enabled="1" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -25052,12 +23663,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -25065,7 +23676,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -25089,7 +23700,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25111,16 +23722,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="47.1065" mapUuid="" type="65640" excludeFromExports="0" zValue="1" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_500.png" anchorPoint="0" groupUuid="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureHeight="26.6623" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" visibility="1" frame="false" position="246.665,178.41,mm" positionOnPage="246.665,178.41,mm" size="47.1065,27.6,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="246.665,178.41,mm" visibility="1" mode="1" position="246.665,178.41,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northMode="0" id="" size="47.1065,27.6,mm" pictureRotation="0" pictureHeight="26.6623" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="1" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_500.png" pictureWidth="47.1065" excludeFromExports="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25140,7 +23751,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame 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;" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65648" resizeMode="0" maxBreakDistance="10" 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;}" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame 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;" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" resizeMode="0" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
         <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -25184,13 +23795,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="false" name="singleFile" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" enabled="1" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="&quot;id&quot;" sortAscending="1" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" hideCoverage="0"/>
+      <Atlas filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" coverageLayerName="marshal_positions" hideCoverage="0" sortKey="&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm">
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25198,7 +23809,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
+          <layer enabled="1" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -25221,9 +23832,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -25236,7 +23847,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25244,7 +23855,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
+            <layer enabled="1" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25270,9 +23881,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="0" pictureWidth="6.31767" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="arrows/NorthArrow_11.svg" anchorPoint="0" groupUuid="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureHeight="7.97477" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" visibility="1" frame="false" position="286.027,2,mm" positionOnPage="286.027,2,mm" size="9.45865,11,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="330">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="286.027,2,mm" visibility="1" mode="0" position="286.027,2,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northMode="0" id="" size="9.45865,11,mm" pictureRotation="330" pictureHeight="7.97477" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" excludeFromExports="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25292,9 +23903,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" labelText="[%upper( &quot;area&quot; )%]" valign="64" positionLock="true" visibility="1" frame="false" position="285.027,205.886,mm" positionOnPage="285.027,205.886,mm" marginX="1" size="142.543,10.3185,mm" background="false" id="" halign="1" itemRotation="270" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="285.027,205.886,mm" marginX="1" visibility="1" position="285.027,205.886,mm" itemRotation="270" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" id="" size="142.543,10.3185,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="3" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[%upper( &quot;area&quot; )%]" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25307,12 +23918,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25320,7 +23931,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -25344,7 +23955,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25354,9 +23965,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem segmentSizeMode="1" segmentMillimeters="26.3519" id="" zValue="2" labelHorizontalPlacement="0" unitLabel="m" excludeFromExports="0" height="3" lineJoinStyle="miter" outlineWidth="0.3" opacity="1" position="7,189.669,mm" blendMode="0" unitType="meters" labelVerticalPlacement="0" boxContentSpace="1" maxBarWidth="150" outlineWidthM="0.3,mm" labelBarSpace="3" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" itemRotation="0" referencePoint="0" minBarWidth="50" numUnitsPerSegment="100" numSegmentsLeft="2" style="Single Box" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" background="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" numMapUnitsPerScaleBarUnit="1" numSegments="4" positionOnPage="7,189.669,mm" size="145.54,16.2165,mm" frameJoinStyle="miter" subdivisionsHeight="1.5" type="65646" lineCapStyle="square" positionLock="true" numSubdivisions="1" alignment="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65646" outlineWidth="0.3" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="7,189.669,mm" alignment="0" minBarWidth="50" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="1" labelBarSpace="3" height="3" numUnitsPerSegment="100" background="false" groupUuid="" segmentMillimeters="26.3519" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="7,189.669,mm" lineJoinStyle="miter" itemRotation="0" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" maxBarWidth="150" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Single Box" size="145.54,16.2165,mm" id="" zValue="2">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25369,12 +23980,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25382,7 +23993,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -25406,7 +24017,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25415,7 +24026,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor blue="0" red="0" green="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -25427,10 +24038,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor blue="0" red="0" green="0" alpha="255"/>
+        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25438,7 +24049,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
+            <layer enabled="1" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -25479,7 +24090,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25487,7 +24098,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
+            <layer enabled="1" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -25528,7 +24139,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25536,7 +24147,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
+            <layer enabled="1" id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -25577,7 +24188,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25585,7 +24196,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
+            <layer enabled="1" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25610,7 +24221,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25618,7 +24229,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
+            <layer enabled="1" id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25643,9 +24254,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="7,5.5,mm" drawCanvasItems="false" positionOnPage="7,5.5,mm" mapFlags="0" size="278.027,180.318,mm" background="false" id="" itemRotation="0" mapRotation="330" followPresetName="Start/Finish" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="7,5.5,mm" visibility="1" followPreset="true" position="7,5.5,mm" itemRotation="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" size="278.027,180.318,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="330" background="false" excludeFromExports="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Start/Finish" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25674,11 +24285,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmin="18.40843143571575169" xmax="18.41790915398017958"/>
+        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="3" rightAnnotationDisplay="3" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="5" minimumIntervalWidth="50" annotationFormat="4" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="1" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="3" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25686,7 +24297,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
+              <layer enabled="1" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -25727,7 +24338,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25735,7 +24346,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
+              <layer enabled="1" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -25778,12 +24389,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -25791,7 +24402,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -25815,7 +24426,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25837,12 +24448,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -25869,13 +24480,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="0" name="svgTextFormat" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" sortAscending="1" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="start_finish_area" hideCoverage="1" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="300" name="Cones" worldFileMap="" units="mm">
+    <Layout name="Cones" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25883,7 +24494,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
+          <layer enabled="1" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -25906,9 +24517,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -25921,7 +24532,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25929,7 +24540,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
+            <layer enabled="1" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25955,9 +24566,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="11" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="256.808,5.21277,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="0" symbolAlignment="1" frame="true" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="256.808,5.21277,mm" size="38.1563,67.2879,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,67.2879,mm" id="" symbolHeight="4" zValue="11">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25974,13 +24585,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -25988,7 +24599,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26012,7 +24623,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26022,13 +24633,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26036,7 +24647,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26060,7 +24671,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26070,13 +24681,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26084,7 +24695,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26108,7 +24719,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26118,13 +24729,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26132,7 +24743,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26156,7 +24767,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26166,13 +24777,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26180,7 +24791,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26204,7 +24815,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26219,11 +24830,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" patch_size="0,0" name="fencing" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
@@ -26235,11 +24846,11 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -26253,9 +24864,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="10" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" labelText="CONES: [% &quot;name&quot; %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,191.188,mm" positionOnPage="6.76779,191.188,mm" marginX="0" size="148.46,6.45211,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="CONES: [% &quot;name&quot; %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26268,12 +24879,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26281,7 +24892,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26305,7 +24916,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26315,9 +24926,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="56.3557" type="65647" excludeFromExports="0" zValue="9" referencePoint="0" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" positionLock="true" sectionY="0" visibility="1" frame="false" position="182.723,191.188,mm" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" size="56.3557,6.45237,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionY="0" background="false" excludeFromExports="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionHeight="5.76">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26331,9 +24942,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" labelText="REVISION 1.1" valign="32" positionLock="true" visibility="1" frame="false" position="212.257,198.083,mm" positionOnPage="212.257,198.083,mm" marginX="0" size="26.8205,6.82826,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.257,198.083,mm" marginX="0" visibility="1" position="212.257,198.083,mm" itemRotation="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26346,12 +24957,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26359,7 +24970,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26383,7 +24994,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26393,9 +25004,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="6" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" valign="32" positionLock="true" visibility="1" frame="false" position="116.805,198.083,mm" positionOnPage="116.805,198.083,mm" marginX="0" size="64.7594,7.10512,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="116.805,198.083,mm" marginX="0" visibility="1" position="116.805,198.083,mm" itemRotation="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" id="" size="64.7594,7.10512,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="6" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26408,12 +25019,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26421,7 +25032,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26445,7 +25056,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26455,9 +25066,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" labelText="Page [% @atlas_featurenumber %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,198.083,mm" positionOnPage="6.76779,198.083,mm" marginX="0" size="52.7903,7.07327,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" id="" size="52.7903,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26470,12 +25081,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26483,7 +25094,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26507,7 +25118,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26517,9 +25128,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="49.3143" mapUuid="" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" anchorPoint="8" groupUuid="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureHeight="28.0105" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" visibility="1" frame="false" position="243.098,175.353,mm" positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26539,9 +25150,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" visibility="1" frame="false" position="6.91779,197.79,mm" positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26554,7 +25165,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26562,7 +25173,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
+          <layer enabled="1" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -26586,9 +25197,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem segmentSizeMode="1" segmentMillimeters="30.2878" id="" zValue="2" labelHorizontalPlacement="0" unitLabel="m" excludeFromExports="0" height="2" lineJoinStyle="round" outlineWidth="0.2" opacity="1" position="6.76779,2.8482,mm" blendMode="0" unitType="meters" labelVerticalPlacement="0" boxContentSpace="0.2" maxBarWidth="100" outlineWidthM="0.3,mm" labelBarSpace="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" itemRotation="0" referencePoint="0" minBarWidth="25" numUnitsPerSegment="500" numSegmentsLeft="2" style="Double Box" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" background="false" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" numMapUnitsPerScaleBarUnit="1" numSegments="2" positionOnPage="6.76779,2.8482,mm" size="104.399,15.8378,mm" frameJoinStyle="miter" subdivisionsHeight="1.5" type="65646" lineCapStyle="square" positionLock="true" numSubdivisions="1" alignment="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="500" background="false" groupUuid="" segmentMillimeters="30.2878" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="104.399,15.8378,mm" id="" zValue="2">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26601,12 +25212,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26614,7 +25225,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26638,7 +25249,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26647,7 +25258,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor blue="0" red="0" green="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -26659,10 +25270,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor blue="0" red="0" green="0" alpha="255"/>
+        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26670,7 +25281,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
+            <layer enabled="1" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -26711,7 +25322,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26719,7 +25330,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
+            <layer enabled="1" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -26760,7 +25371,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26768,7 +25379,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
+            <layer enabled="1" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -26809,7 +25420,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26817,7 +25428,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
+            <layer enabled="1" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -26842,7 +25453,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26850,7 +25461,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
+            <layer enabled="1" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -26875,9 +25486,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="6.76779,9.35102,mm" drawCanvasItems="false" positionOnPage="6.76779,9.35102,mm" mapFlags="0" size="283.418,180.92,mm" background="false" id="" itemRotation="0" mapRotation="0" followPresetName="Fencing" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26912,7 +25523,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92282769675948373" ymin="-33.94965747213089458" xmin="18.35799642373368457" xmax="18.4000263443481451"/>
+        <Extent xmax="18.4000263443481451" xmin="18.35799642373368457" ymax="-33.92282769675948373" ymin="-33.94965747213089458"/>
         <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>
@@ -26927,9 +25538,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="3" rightAnnotationDisplay="3" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="5" minimumIntervalWidth="50" annotationFormat="4" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="1" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="3" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26937,7 +25548,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
+              <layer enabled="1" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -26978,7 +25589,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26986,7 +25597,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
+              <layer enabled="1" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -27029,12 +25640,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -27042,7 +25653,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -27066,7 +25677,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -27088,14 +25699,14 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -27135,13 +25746,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="cone_groups" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortKey="&quot;group&quot;" sortAscending="1" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="cone_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortFeatures="1" 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" filterFeatures="0" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
+    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="9"/>
+      <Grid offsetX="0" resUnits="mm" resolution="9" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27149,7 +25760,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
+          <layer enabled="1" id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -27172,9 +25783,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -27187,7 +25798,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -27195,7 +25806,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
+            <layer enabled="1" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -27220,12 +25831,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" labelText="Directions to Start of Race" valign="64" positionLock="false" visibility="1" frame="false" position="4.43449,186.634,mm" positionOnPage="4.43449,186.634,mm" marginX="1" size="83.9998,10.4638,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.43449,186.634,mm" marginX="1" visibility="1" position="4.43449,186.634,mm" itemRotation="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" id="" size="83.9998,10.4638,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Directions to Start of Race" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27238,12 +25849,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27251,7 +25862,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27275,7 +25886,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27285,9 +25896,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" labelText="Gun Run" valign="32" positionLock="false" visibility="1" frame="false" position="4.43449,197.498,mm" positionOnPage="4.43449,197.498,mm" marginX="1" size="48.2923,9.511,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.43449,197.498,mm" marginX="1" visibility="1" position="4.43449,197.498,mm" itemRotation="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" id="" size="48.2923,9.511,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Gun Run" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27300,12 +25911,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27313,7 +25924,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27337,7 +25948,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27347,9 +25958,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="6" symbolWidth="9" wmsLegendWidth="50" symbolHeight="5" excludeFromExports="0" opacity="1" position="10.096,10.8563,mm" columnSpace="0" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="true" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" columnCount="1" titleAlignment="1" frameJoinStyle="round" type="65642" equalColumnWidth="0" legendFilterByMap="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="false" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="139" green="139" red="139" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="9" rasterBorderWidth="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" legendFilterByMap="1" resizeToContents="1" referencePoint="0" frameJoinStyle="round" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" itemRotation="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="0" positionLock="false" size="59.0766,76,mm" id="" symbolHeight="5" zValue="6">
+        <FrameColor blue="139" red="139" green="139" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27366,13 +25977,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="7.6444479999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="16" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="7.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27380,7 +25991,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27404,7 +26015,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27414,13 +26025,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27428,7 +26039,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27452,7 +26063,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27462,13 +26073,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27476,7 +26087,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27500,7 +26111,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27510,13 +26121,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27524,7 +26135,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27548,7 +26159,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27558,13 +26169,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbolLabel" alignment="1" marginLeft="3">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="3" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27572,7 +26183,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27596,7 +26207,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27611,13 +26222,13 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked" groupLayer="">
+          <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>
             </customproperties>
-            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" name="poi_labels" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="Start/Finish" name="legend/label-0" type="QString"/>
@@ -27630,7 +26241,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" name="directions_to_start" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
@@ -27644,9 +26255,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" labelText="REVISION 1.0" valign="32" positionLock="false" visibility="1" frame="false" position="221.862,190.027,mm" positionOnPage="221.862,190.027,mm" marginX="1" size="27.7839,6.871,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="221.862,190.027,mm" marginX="1" visibility="1" position="221.862,190.027,mm" itemRotation="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" id="" size="27.7839,6.871,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27659,12 +26270,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27672,7 +26283,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27696,7 +26307,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27706,9 +26317,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="4" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" labelText="Sunday, 20 October 2019" valign="64" positionLock="false" visibility="1" frame="false" position="197.975,197.498,mm" positionOnPage="197.975,197.498,mm" marginX="1" size="51.6706,6.60801,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="197.975,197.498,mm" marginX="1" visibility="1" position="197.975,197.498,mm" itemRotation="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27721,12 +26332,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27734,7 +26345,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27758,7 +26369,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27768,9 +26379,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="24.2337" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65640" excludeFromExports="0" zValue="3" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="4" groupUuid="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureHeight="24.3824" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" visibility="1" frame="false" position="249.646,179.724,mm" positionOnPage="249.646,179.724,mm" size="42.9838,24.3824,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="249.646,179.724,mm" visibility="1" mode="1" position="249.646,179.724,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northMode="0" id="" size="42.9838,24.3824,mm" pictureRotation="0" pictureHeight="24.3824" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337" excludeFromExports="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" positionLock="false" type="65640" groupUuid="" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27790,9 +26401,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="2" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" visibility="1" frame="false" position="4.58449,197.248,mm" positionOnPage="4.58449,197.248,mm" size="244.912,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.58449,197.248,mm" shapeType="1" visibility="1" position="4.58449,197.248,mm" itemRotation="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" size="244.912,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="false" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27805,7 +26416,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27813,7 +26424,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}">
+          <layer enabled="1" id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -27837,9 +26448,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" isTemporal="0" followPreset="true" positionLock="false" visibility="1" frame="false" position="4.43449,6.411,mm" drawCanvasItems="false" positionOnPage="4.43449,6.411,mm" mapFlags="0" size="288.007,183.616,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Ask Me" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="4.43449,6.411,mm" visibility="1" followPreset="true" position="4.43449,6.411,mm" itemRotation="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" size="288.007,183.616,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Ask Me" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27868,7 +26479,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" ymin="-33.90994364588821952" xmin="18.39762336729721071" xmax="18.41789384089274151"/>
+        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952"/>
         <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>
@@ -27883,9 +26494,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27893,7 +26504,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
+              <layer enabled="1" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -27934,7 +26545,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27942,7 +26553,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
+              <layer enabled="1" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -27974,12 +26585,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -27987,7 +26598,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -28011,7 +26622,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28033,12 +26644,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -28056,13 +26667,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" sortFeatures="0" coverageLayer="" filterFeatures="0" hideCoverage="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" hideCoverage="0" pageNameExpression="" coverageLayer="" sortFeatures="0" filterFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" name="Routes" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" units="mm">
+    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28070,7 +26681,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
+          <layer enabled="1" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -28093,9 +26704,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28108,7 +26719,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28116,7 +26727,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
+            <layer enabled="1" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -28141,12 +26752,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="13" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" labelText="REVISION 1.7" valign="32" positionLock="true" visibility="1" frame="false" position="200.171,199.082,mm" positionOnPage="200.171,199.082,mm" marginX="0" size="61.5373,6.8714,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="200.171,199.082,mm" marginX="0" visibility="1" position="200.171,199.082,mm" itemRotation="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" id="" size="61.5373,6.8714,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="13" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.7" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28159,12 +26770,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28172,7 +26783,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -28196,7 +26807,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28206,9 +26817,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="12" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" labelText="Gun Run 2023: [%&quot;Source&quot;%]" valign="64" positionLock="true" visibility="1" frame="false" position="9.7863,192.073,mm" positionOnPage="9.7863,192.073,mm" marginX="0" size="61.5373,6.60801,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.7863,192.073,mm" marginX="0" visibility="1" position="9.7863,192.073,mm" itemRotation="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" id="" size="61.5373,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="12" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Gun Run 2023: [%&quot;Source&quot;%]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28221,12 +26832,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28234,7 +26845,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -28258,7 +26869,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28268,9 +26879,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="11" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" valign="32" positionLock="true" visibility="1" frame="false" position="9.7863,199.082,mm" positionOnPage="9.7863,199.082,mm" marginX="0" size="61.5373,6.60801,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.7863,199.082,mm" marginX="0" visibility="1" position="9.7863,199.082,mm" itemRotation="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" id="" size="61.5373,6.60801,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="11" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28283,12 +26894,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28296,7 +26907,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -28320,7 +26931,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28330,9 +26941,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="29.7523" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" type="65640" excludeFromExports="0" zValue="10" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" anchorPoint="4" groupUuid="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureHeight="16.8993" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" visibility="1" frame="false" position="262.196,188.218,mm" positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="16.8993" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="10" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="29.7523" excludeFromExports="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28352,9 +26963,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="9" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" visibility="1" frame="false" position="9.57644,198.832,mm" positionOnPage="9.57644,198.832,mm" size="251.982,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.57644,198.832,mm" shapeType="1" visibility="1" position="9.57644,198.832,mm" itemRotation="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" size="251.982,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="9" frame="false" background="false" excludeFromExports="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28367,7 +26978,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28375,7 +26986,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
+          <layer enabled="1" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -28399,9 +27010,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="8" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="8.21644,4.09761,mm" drawCanvasItems="true" positionOnPage="8.21644,4.09761,mm" mapFlags="0" size="109.221,188.689,mm" background="true" id="Trail Finish" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.21644,4.09761,mm" visibility="1" followPreset="true" position="8.21644,4.09761,mm" itemRotation="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" size="109.221,188.689,mm" frameJoinStyle="miter" blendMode="0" zValue="8" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28420,18 +27031,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007966676468953" ymin="-33.93242806047424409" xmin="18.39314911415855391" xmax="18.41187375074135701"/>
+        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymax="-33.90007966676468953" ymin="-33.93242806047424409"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="7" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="113.002,2.39423,mm" drawCanvasItems="true" positionOnPage="113.002,2.39423,mm" mapFlags="0" size="179.156,191.505,mm" background="true" id="Trail Start" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="113.002,2.39423,mm" visibility="1" followPreset="true" position="113.002,2.39423,mm" itemRotation="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" size="179.156,191.505,mm" frameJoinStyle="miter" blendMode="0" zValue="7" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28450,18 +27061,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92465573363980269" ymin="-33.95791657202656921" xmin="18.3924263991010406" xmax="18.42354248737832023"/>
+        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymax="-33.92465573363980269" ymin="-33.95791657202656921"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="6" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="5.86559,4.09761,mm" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" mapFlags="0" size="67.7828,166.874,mm" background="true" id="Left inset 21KM" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="6" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28505,18 +27116,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmin="18.37399999999999878" xmax="18.38626092146919788"/>
+        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="5" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="131.391,120.702,mm" drawCanvasItems="true" positionOnPage="131.391,120.702,mm" mapFlags="0" size="113.3,76.1023,mm" background="true" id="Bottom inset 21KM" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="144" green="34" red="103" alpha="255"/>
-        <BackgroundColor blue="215" green="175" red="200" alpha="128"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="131.391,120.702,mm" visibility="1" followPreset="true" position="131.391,120.702,mm" itemRotation="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" size="113.3,76.1023,mm" frameJoinStyle="miter" blendMode="0" zValue="5" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="144" red="103" green="34" alpha="255"/>
+        <BackgroundColor blue="215" red="200" green="175" alpha="128"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28535,18 +27146,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmin="18.41509620662891678" xmax="18.42329132157224336"/>
+        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.15,mm" groupUuid="" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="8.14144,4.02261,mm" drawCanvasItems="true" positionOnPage="8.14144,4.02261,mm" mapFlags="0" size="282.732,188.839,mm" background="true" id="Main Map" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="round" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.14144,4.02261,mm" visibility="1" followPreset="true" position="8.14144,4.02261,mm" itemRotation="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" size="282.732,188.839,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28575,11 +27186,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8918539481981469" ymin="-33.92600000000000193" xmin="18.37199999999999989" xmax="18.42312398088981951"/>
+        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymax="-33.8918539481981469" ymin="-33.92600000000000193"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28587,7 +27198,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
+              <layer enabled="1" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -28628,7 +27239,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28636,7 +27247,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
+              <layer enabled="1" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -28668,12 +27279,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -28681,7 +27292,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -28705,7 +27316,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28727,8 +27338,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" show="1" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" inverted="0" centered="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" inverted="0">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28742,7 +27353,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
+            <layer enabled="1" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -28778,12 +27389,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -28808,13 +27419,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" enabled="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortKey="&quot;Sort&quot;" sortAscending="1" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" hideCoverage="0"/>
+      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" hideCoverage="0" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filterFeatures="1" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="120" name="Marshal Plan A1" worldFileMap="" units="mm">
+    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28822,7 +27433,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
+          <layer enabled="1" id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -28845,9 +27456,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="594,841,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" size="594,841,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28860,7 +27471,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28868,7 +27479,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
+            <layer enabled="1" id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -28894,9 +27505,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="8" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="25.5925,18.7971,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="false" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="25.5925,18.7971,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" itemRotation="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="4,4,mm" id="" symbolHeight="4" zValue="8">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28913,13 +27524,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.6444479999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="16" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -28927,7 +27538,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -28951,7 +27562,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28961,13 +27572,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -28975,7 +27586,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -28999,7 +27610,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29009,13 +27620,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="1" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="1">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29023,7 +27634,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29047,7 +27658,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29057,13 +27668,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29071,7 +27682,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29095,7 +27706,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29105,13 +27716,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29119,7 +27730,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29143,7 +27754,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29158,11 +27769,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes20170907054841602" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
@@ -29176,9 +27787,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" labelText="MARSHAL POSITIONS" valign="64" positionLock="true" visibility="1" frame="false" position="5.2963,808.939,mm" positionOnPage="5.2963,808.939,mm" marginX="1" size="91.9494,15.0649,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.2963,808.939,mm" marginX="1" visibility="1" position="5.2963,808.939,mm" itemRotation="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" id="" size="91.9494,15.0649,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29191,12 +27802,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29204,7 +27815,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29228,7 +27839,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29238,9 +27849,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" labelText="REVISION 1.2" valign="32" positionLock="true" visibility="1" frame="false" position="430.403,825.052,mm" positionOnPage="430.403,825.052,mm" marginX="1" size="56.6212,15.3656,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="430.403,825.052,mm" marginX="1" visibility="1" position="430.403,825.052,mm" itemRotation="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" id="" size="56.6212,15.3656,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.2" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29253,12 +27864,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29266,7 +27877,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29290,7 +27901,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29300,9 +27911,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="4" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" labelText="Sunday, 20 October 2019" valign="64" positionLock="true" visibility="1" frame="false" position="372.175,808.942,mm" positionOnPage="372.175,808.942,mm" marginX="1" size="114.848,15.0635,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="372.175,808.942,mm" marginX="1" visibility="1" position="372.175,808.942,mm" itemRotation="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" id="" size="114.848,15.0635,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29315,12 +27926,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29328,7 +27939,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29352,7 +27963,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29362,9 +27973,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="63.5856" mapUuid="" type="65640" excludeFromExports="0" zValue="3" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="8" groupUuid="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureHeight="63.9757" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" visibility="1" frame="false" position="489.557,775.395,mm" positionOnPage="489.557,775.395,mm" size="100.498,63.9757,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="489.557,775.395,mm" visibility="1" mode="1" position="489.557,775.395,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northMode="0" id="" size="100.498,63.9757,mm" pictureRotation="0" pictureHeight="63.9757" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856" excludeFromExports="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29384,9 +27995,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="2" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" visibility="1" frame="false" position="5.4463,824.155,mm" positionOnPage="5.4463,824.155,mm" size="481.428,0.606138,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.4463,824.155,mm" shapeType="1" visibility="1" position="5.4463,824.155,mm" itemRotation="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" size="481.428,0.606138,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29399,7 +28010,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29407,7 +28018,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
+          <layer enabled="1" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -29431,9 +28042,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="3.94474,5.25965,mm" drawCanvasItems="false" positionOnPage="3.94474,5.25965,mm" mapFlags="0" size="584.759,811.213,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Marshal plan" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.94474,5.25965,mm" visibility="1" followPreset="true" position="3.94474,5.25965,mm" itemRotation="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" size="584.759,811.213,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29462,14 +28073,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmin="18.37434415142052657" xmax="18.42299397558693741"/>
+        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -29480,13 +28091,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="0" name="pdfTextFormat" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" sortAscending="1" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="complete_marshal_overview" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filterFeatures="0" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout printResolution="144" name="Access Roads" worldFileMap="" units="mm">
+    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29494,7 +28105,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
+          <layer enabled="1" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -29517,9 +28128,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -29532,7 +28143,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -29540,7 +28151,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
+            <layer enabled="1" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -29565,12 +28176,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem wrapChar="" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="15" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="244.484,130.172,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="true" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="0" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="244.484,130.172,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="244.484,130.172,mm" minSymbolSize="0" itemRotation="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="34.45,40.8,mm" id="" symbolHeight="4" zValue="15">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29584,13 +28195,13 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29598,7 +28209,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29622,7 +28233,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29632,13 +28243,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29646,7 +28257,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29670,7 +28281,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29680,13 +28291,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29694,7 +28305,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29718,7 +28329,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29728,13 +28339,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29742,7 +28353,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29766,7 +28377,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29776,13 +28387,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29790,7 +28401,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29814,7 +28425,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29829,11 +28440,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" name="residents_access_roads" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -29845,9 +28456,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" labelText="ACCESS ROUTES FOR RESIDENTS" valign="64" positionLock="true" visibility="1" frame="false" position="9.37446,191.81,mm" positionOnPage="9.37446,191.81,mm" marginX="0" size="194.851,7.272,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="ACCESS ROUTES FOR RESIDENTS" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29860,12 +28471,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29873,7 +28484,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29897,7 +28508,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29907,9 +28518,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="6" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" labelText="REVISION 1.1" valign="64" positionLock="true" visibility="1" frame="false" position="204.225,191.81,mm" positionOnPage="204.225,191.81,mm" marginX="1" size="57.4836,6.8714,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29922,12 +28533,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29935,7 +28546,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29959,7 +28570,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29969,9 +28580,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" labelText="Sunday, 20 October 2019" valign="64" positionLock="true" visibility="1" frame="false" position="210.038,199.082,mm" positionOnPage="210.038,199.082,mm" marginX="1" size="51.6706,6.60801,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29984,12 +28595,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29997,7 +28608,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30021,7 +28632,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30031,9 +28642,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="17.3653" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="4" groupUuid="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureHeight="17.4718" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" visibility="1" frame="false" position="262.196,188.218,mm" positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30053,9 +28664,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" visibility="1" frame="false" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30068,7 +28679,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30076,7 +28687,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
+          <layer enabled="1" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -30100,9 +28711,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="2" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="5.86559,4.09761,mm" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" mapFlags="0" size="67.7828,166.874,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Access Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30146,7 +28757,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168"/>
         <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>
@@ -30161,9 +28772,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30171,7 +28782,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
+              <layer enabled="1" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -30212,7 +28823,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30220,7 +28831,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
+              <layer enabled="1" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -30252,12 +28863,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -30265,7 +28876,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -30289,7 +28900,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -30311,16 +28922,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.15,mm" groupUuid="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="9.44946,9.08557,mm" drawCanvasItems="false" positionOnPage="9.44946,9.08557,mm" mapFlags="0" size="282.012,175.592,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Access Routes" blendMode="0" frameJoinStyle="round" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,9.08557,mm" visibility="1" followPreset="true" position="9.44946,9.08557,mm" itemRotation="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" size="282.012,175.592,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30349,7 +28960,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" ymin="-33.92999999999999972" xmin="18.37000000000000099" xmax="18.42303507276415431"/>
+        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972"/>
         <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>
@@ -30364,9 +28975,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30374,7 +28985,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
+              <layer enabled="1" id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -30415,7 +29026,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30423,7 +29034,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
+              <layer enabled="1" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -30455,12 +29066,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -30468,7 +29079,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -30492,7 +29103,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -30514,12 +29125,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -30537,13 +29148,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="false" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" enabled="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="144" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm">
+    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30551,7 +29162,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
+          <layer enabled="1" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -30574,9 +29185,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -30589,7 +29200,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -30597,7 +29208,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
+            <layer enabled="1" id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -30622,12 +29233,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" labelText="Access to P9 Parking and VIP Tent" valign="64" positionLock="true" visibility="1" frame="false" position="9.37446,191.81,mm" positionOnPage="9.37446,191.81,mm" marginX="0" size="194.851,7.272,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Access to P9 Parking and VIP Tent" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30640,12 +29251,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30653,7 +29264,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30677,7 +29288,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30687,9 +29298,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="6" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" labelText="REVISION 1.0" valign="64" positionLock="true" visibility="1" frame="false" position="204.225,191.81,mm" positionOnPage="204.225,191.81,mm" marginX="1" size="57.4836,6.8714,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30702,12 +29313,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30715,7 +29326,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30739,7 +29350,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30749,9 +29360,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" labelText="Sunday, 20 October 2019" valign="64" positionLock="true" visibility="1" frame="false" position="210.038,199.082,mm" positionOnPage="210.038,199.082,mm" marginX="1" size="51.6706,6.60801,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30764,12 +29375,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30777,7 +29388,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30801,7 +29412,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30811,9 +29422,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="17.3653" mapUuid="" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="4" groupUuid="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureHeight="17.4718" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" visibility="1" frame="false" position="262.196,188.218,mm" positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30833,9 +29444,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" visibility="1" frame="false" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30848,7 +29459,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30856,7 +29467,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}">
+          <layer enabled="1" id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -30880,9 +29491,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.15,mm" groupUuid="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" isTemporal="0" followPreset="false" positionLock="false" visibility="1" frame="false" position="9.44946,7.25098,mm" drawCanvasItems="false" positionOnPage="9.44946,7.25098,mm" mapFlags="0" size="282.012,182.649,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="" blendMode="0" frameJoinStyle="round" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,7.25098,mm" visibility="1" followPreset="false" position="9.44946,7.25098,mm" itemRotation="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" size="282.012,182.649,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30911,7 +29522,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" ymin="-33.90848231674397084" xmin="18.40103928699269886" xmax="18.40919746780259914"/>
+        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084"/>
         <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>
@@ -30926,9 +29537,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30936,7 +29547,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
+              <layer enabled="1" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -30977,7 +29588,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30985,7 +29596,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
+              <layer enabled="1" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -31017,12 +29628,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -31030,7 +29641,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -31054,7 +29665,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -31076,12 +29687,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -31099,13 +29710,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="false" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="120" name="Marshal Plan" worldFileMap="" units="mm">
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31113,7 +29724,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
+          <layer enabled="1" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -31136,9 +29747,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,420,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" size="297,420,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31151,7 +29762,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -31159,7 +29770,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
+            <layer enabled="1" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -31185,9 +29796,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" sectionWidth="23.5967" type="65647" excludeFromExports="0" zValue="9" referencePoint="0" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" positionLock="true" sectionY="0" visibility="1" frame="false" position="112.086,406.476,mm" positionOnPage="112.086,406.476,mm" sectionHeight="8.3142" size="23.5967,8.3142,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="112.086,406.476,mm" visibility="1" position="112.086,406.476,mm" itemRotation="0" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" id="" size="23.5967,8.3142,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="23.5967" frame="false" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionY="0" background="false" excludeFromExports="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionHeight="8.3142">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31201,9 +29812,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" labelText="REVISION 1.8" valign="32" positionLock="true" visibility="1" frame="false" position="214.292,406.874,mm" positionOnPage="214.292,406.874,mm" marginX="0" size="27.7839,7.51682,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="214.292,406.874,mm" marginX="0" visibility="1" position="214.292,406.874,mm" itemRotation="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" id="" size="27.7839,7.51682,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.8" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31216,12 +29827,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31229,7 +29840,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -31253,7 +29864,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31263,9 +29874,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" labelText="MARSHAL POSITIONS" valign="64" positionLock="true" visibility="1" frame="false" position="5.69321,398.344,mm" positionOnPage="5.69321,398.344,mm" marginX="0" size="45.1194,8.13137,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.69321,398.344,mm" marginX="0" visibility="1" position="5.69321,398.344,mm" itemRotation="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" id="" size="45.1194,8.13137,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31278,12 +29889,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31291,7 +29902,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -31315,7 +29926,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31325,9 +29936,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wrapChar="" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="6" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="15.6525,12.5708,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="false" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="15.6525,12.5708,mm" size="22.2406,33.08,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" itemRotation="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="21.8263,33.2917,mm" id="" symbolHeight="4" zValue="6">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31344,13 +29955,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.6444479999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="16" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31358,7 +29969,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31382,7 +29993,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31392,13 +30003,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31406,7 +30017,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31430,7 +30041,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31440,13 +30051,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="1" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="1">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31454,7 +30065,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31478,7 +30089,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31488,13 +30099,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31502,7 +30113,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31526,7 +30137,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31536,13 +30147,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31550,7 +30161,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31574,7 +30185,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31589,13 +30200,13 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <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>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -31609,9 +30220,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="118.192" type="65647" excludeFromExports="0" zValue="5" referencePoint="0" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" positionLock="true" sectionY="0" visibility="1" frame="false" position="5.69321,406.988,mm" positionOnPage="5.69321,406.988,mm" sectionHeight="7.80192" size="118.192,7.80192,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="5.69321,406.988,mm" visibility="1" position="5.69321,406.988,mm" itemRotation="0" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" id="" size="118.192,7.80192,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="5" sectionWidth="118.192" frame="false" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionY="0" background="false" excludeFromExports="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionHeight="7.80192">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31625,9 +30236,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="93.5757" type="65647" excludeFromExports="0" zValue="4" referencePoint="0" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" positionLock="true" sectionY="0" visibility="1" frame="false" position="148.501,398.344,mm" positionOnPage="148.501,398.344,mm" sectionHeight="8.13167" size="93.5757,8.13167,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="148.501,398.344,mm" visibility="1" position="148.501,398.344,mm" itemRotation="0" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" id="" size="93.5757,8.13167,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="4" sectionWidth="93.5757" frame="false" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionY="0" background="false" excludeFromExports="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionHeight="8.13167">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31641,9 +30252,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="49.3143" mapUuid="" type="65640" excludeFromExports="0" zValue="3" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../../Gun Run 2023.png" anchorPoint="8" groupUuid="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureHeight="27.9119" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" visibility="1" frame="false" position="243.319,382.696,mm" positionOnPage="243.319,382.696,mm" size="49.3143,31.2967,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.319,382.696,mm" visibility="1" mode="1" position="243.319,382.696,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northMode="0" id="" size="49.3143,31.2967,mm" pictureRotation="0" pictureHeight="27.9119" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../../Gun Run 2023.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31663,9 +30274,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="2" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" visibility="1" frame="false" position="5.84321,406.626,mm" positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.84321,406.626,mm" shapeType="1" visibility="1" position="5.84321,406.626,mm" itemRotation="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" size="236.083,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31678,7 +30289,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31686,7 +30297,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
+          <layer enabled="1" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -31710,9 +30321,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="5.03,5.9483,mm" drawCanvasItems="false" positionOnPage="5.03,5.9483,mm" mapFlags="0" size="286.94,392.396,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Marshal plan" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.03,5.9483,mm" visibility="1" followPreset="true" position="5.03,5.9483,mm" itemRotation="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" size="286.94,392.396,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31741,16 +30352,16 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.9248732774534929" ymin="-33.94797288016832226" xmin="18.36924763341120581" xmax="18.38613924055453452"/>
+        <Extent xmax="18.41474568521422484" xmin="18.39785407807089612" ymax="-33.89580042337001231" ymin="-33.91890002608484167"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame html="Page [% &quot;page&quot; %] " useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="Page [% &quot;page&quot; %] " evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
         <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -31765,7 +30376,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
         <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -31780,7 +30391,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame 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>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame 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>" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -31811,13 +30422,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="0" name="pdfTextFormat" type="int"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" sortAscending="1" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="300" name="Fencing" worldFileMap="" units="mm">
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31825,7 +30436,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
+          <layer enabled="1" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -31848,9 +30459,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31863,7 +30474,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -31871,7 +30482,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
+            <layer enabled="1" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -31897,9 +30508,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wrapChar="" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="11" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="256.808,5.21277,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="0" symbolAlignment="1" frame="true" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="256.808,5.21277,mm" size="38.1563,68.0108,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,68.0108,mm" id="" symbolHeight="4" zValue="11">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31916,13 +30527,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31930,7 +30541,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31954,7 +30565,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31964,13 +30575,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31978,7 +30589,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32002,7 +30613,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32012,13 +30623,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -32026,7 +30637,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32050,7 +30661,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32060,13 +30671,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -32074,7 +30685,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32098,7 +30709,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32108,13 +30719,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -32122,7 +30733,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32146,7 +30757,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32161,11 +30772,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" patch_size="0,0" name="fencing" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
@@ -32177,11 +30788,11 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -32195,9 +30806,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="10" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" labelText="FENCING: [% &quot;name&quot; %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,191.188,mm" positionOnPage="6.76779,191.188,mm" marginX="0" size="148.46,6.45211,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="FENCING: [% &quot;name&quot; %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32210,12 +30821,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32223,7 +30834,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32247,7 +30858,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32257,9 +30868,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="56.3557" type="65647" excludeFromExports="0" zValue="9" referencePoint="0" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" positionLock="true" sectionY="0" visibility="1" frame="false" position="182.723,191.188,mm" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" size="56.3557,6.45237,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionY="0" background="false" excludeFromExports="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionHeight="5.76">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32273,9 +30884,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" labelText="REVISION 1.1" valign="32" positionLock="true" visibility="1" frame="false" position="212.258,198.083,mm" positionOnPage="212.258,198.083,mm" marginX="0" size="26.8205,6.82826,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.258,198.083,mm" marginX="0" visibility="1" position="212.258,198.083,mm" itemRotation="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32288,12 +30899,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32301,7 +30912,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32325,7 +30936,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32335,9 +30946,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" valign="32" positionLock="true" visibility="1" frame="false" position="62.6706,198.083,mm" positionOnPage="62.6706,198.083,mm" marginX="1" size="51.1638,7.07327,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="62.6706,198.083,mm" marginX="1" visibility="1" position="62.6706,198.083,mm" itemRotation="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" id="" size="51.1638,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32350,12 +30961,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32363,7 +30974,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32387,7 +30998,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32397,9 +31008,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" labelText="Page [% @atlas_featurenumber %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,198.083,mm" positionOnPage="6.76779,198.083,mm" marginX="0" size="90.2083,7.07327,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" id="" size="90.2083,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32412,12 +31023,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32425,7 +31036,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32449,7 +31060,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32459,9 +31070,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="49.3143" mapUuid="" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" anchorPoint="8" groupUuid="" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" pictureHeight="28.0105" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionLock="true" visibility="1" frame="false" position="243.098,175.353,mm" positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32481,9 +31092,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" visibility="1" frame="false" position="6.91779,197.79,mm" positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32496,7 +31107,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32504,7 +31115,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
+          <layer enabled="1" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -32528,9 +31139,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem segmentSizeMode="1" segmentMillimeters="25.8173" id="" zValue="2" labelHorizontalPlacement="0" unitLabel="m" excludeFromExports="0" height="2" lineJoinStyle="round" outlineWidth="0.2" opacity="1" position="6.76779,2.8482,mm" blendMode="0" unitType="meters" labelVerticalPlacement="0" boxContentSpace="0.2" maxBarWidth="100" outlineWidthM="0.3,mm" labelBarSpace="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" itemRotation="0" referencePoint="0" minBarWidth="25" numUnitsPerSegment="20" numSegmentsLeft="2" style="Double Box" frame="false" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" background="false" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" visibility="1" numMapUnitsPerScaleBarUnit="1" numSegments="2" positionOnPage="6.76779,2.8482,mm" size="87.2133,15.8378,mm" frameJoinStyle="miter" subdivisionsHeight="1.5" type="65646" lineCapStyle="square" positionLock="true" numSubdivisions="1" alignment="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="20" background="false" groupUuid="" segmentMillimeters="25.8173" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="87.2133,15.8378,mm" id="" zValue="2">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32543,12 +31154,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32556,7 +31167,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32580,7 +31191,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32589,7 +31200,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor blue="0" red="0" green="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -32601,10 +31212,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor blue="0" red="0" green="0" alpha="255"/>
+        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32612,7 +31223,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}">
+            <layer enabled="1" id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -32653,7 +31264,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32661,7 +31272,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
+            <layer enabled="1" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -32702,7 +31313,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32710,7 +31321,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
+            <layer enabled="1" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -32751,7 +31362,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32759,7 +31370,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
+            <layer enabled="1" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -32784,7 +31395,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32792,7 +31403,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
+            <layer enabled="1" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -32817,9 +31428,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="6.76779,9.35102,mm" drawCanvasItems="false" positionOnPage="6.76779,9.35102,mm" mapFlags="0" size="283.418,180.92,mm" background="false" id="" itemRotation="0" mapRotation="0" followPresetName="Fencing" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32854,7 +31465,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94132830492694808" ymin="-33.94258732662760991" xmin="18.37624285840067628" xmax="18.37821516684363488"/>
+        <Extent xmax="18.37821516684363488" xmin="18.37624285840067628" ymax="-33.94132830492694808" ymin="-33.94258732662760991"/>
         <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>
@@ -32869,9 +31480,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="3" rightAnnotationDisplay="3" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="5" minimumIntervalWidth="50" annotationFormat="4" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="1" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="3" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32879,7 +31490,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
+              <layer enabled="1" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -32920,7 +31531,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32928,7 +31539,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
+              <layer enabled="1" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -32971,12 +31582,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -32984,7 +31595,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -33008,7 +31619,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -33030,14 +31641,14 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -33077,7 +31688,7 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortKey="&quot;group&quot;" sortAscending="1" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="fence_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filterFeatures="0" coverageLayerProvider="virtual"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
@@ -33085,7 +31696,7 @@ def my_form_open(dialog, layer, feature):
   <Sensors/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.90048855131077943" ymin="-33.91260376305159951" xmin="18.39943371120850202" xmax="18.42176257945853024">
+    <DefaultViewExtent xmax="18.3966948564276187" xmin="18.39365183857621489" ymax="-33.90669064043363079" ymin="-33.90828503601445476">
       <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>
@@ -33102,13 +31713,13 @@ def my_form_open(dialog, layer, feature):
   <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1"/>
+  <ProjectTimeSettings timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
     </terrainProvider>
   </ElevationProperties>
-  <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
+  <ProjectDisplaySettings CoordinateAxisOrder="Default" CoordinateType="MapCrs">
     <BearingFormat id="bearing">
       <Option type="Map">
         <Option name="decimal_separator" type="invalid"/>
@@ -33150,7 +31761,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerName="marshal_positions" autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" destinationLayerProvider="ogr" destinationFollowsActiveLayer="1" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions">
+  <ProjectGpsSettings destinationLayerProvider="memory" destinationLayerSource="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" destinationLayer="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" autoAddTrackVertices="0" destinationFollowsActiveLayer="1" autoCommitFeatures="0" destinationLayerName="route_markers">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index a793fac..bf9e308 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" saveUser="tim" saveDateTime="2023-09-11T20:49:43" saveUserFull="Timothy Allen" version="3.32.2-Lima">
+<qgis saveUser="tim" projectname="Gun Run" saveUserFull="Timothy Allen" saveDateTime="2023-09-14T17:03:32" version="3.32.2-Lima">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -17,16 +17,16 @@
       <geographicflag>true</geographicflag>
     </spatialrefsys>
   </projectCrs>
-  <elevation-shading-renderer combined-method="0" edl-strength="1000" edl-is-active="1" hillshading-z-factor="1" edl-distance="0.5" hillshading-is-multidirectional="0" is-active="0" light-altitude="45" hillshading-is-active="0" edl-distance-unit="0" light-azimuth="315"/>
+  <elevation-shading-renderer light-azimuth="315" edl-is-active="1" edl-distance="0.5" edl-distance-unit="0" hillshading-is-multidirectional="0" combined-method="0" edl-strength="1000" hillshading-is-active="0" hillshading-z-factor="1" is-active="0" light-altitude="45"/>
   <layer-tree-group>
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group name="Marshals" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Marshals" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" patch_size="0,0" name="marshal_positions" expanded="1" legend_split_behavior="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" legend_exp="" name="marshal_positions" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -36,26 +36,26 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./extra_security.shp" patch_size="0,0" name="extra_security" expanded="1" legend_split_behavior="0" id="extra_security20170921130834191" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="extra_security20170921130834191" legend_exp="" name="extra_security" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./extra_security.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" patch_size="0,0" name="marshals_by_position" expanded="1" legend_split_behavior="0" id="marshals_by_position20161003112326575" providerKey="delimitedtext" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="marshals_by_position20161003112326575" legend_exp="" name="marshals_by_position" legend_split_behavior="0" patch_size="0,0" expanded="1" source="../marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" providerKey="delimitedtext">
         <customproperties>
           <Option type="Map">
             <Option value="1" name="showFeatureCount" type="int"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" patch_size="0,0" name="complete_marshal_overview" expanded="1" legend_split_behavior="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" legend_exp="" name="complete_marshal_overview" legend_split_behavior="0" patch_size="0,0" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" patch_size="0,0" name="marshal_overviews" expanded="0" legend_split_behavior="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" legend_exp="" name="marshal_overviews" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option value="" name="legend/expressionFilter" type="QString"/>
@@ -64,11 +64,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Fencing and Cones" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./fencing.shp|layername=fencing" patch_size="0,0" name="fencing" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
@@ -77,39 +77,31 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" patch_size="-1,-1" name="cone_groups" expanded="1" legend_split_behavior="0" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" legend_exp="" name="cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" patch_size="-1,-1" name="fence_groups" expanded="1" legend_split_behavior="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" legend_exp="" name="fence_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" patch_size="-1,-1" name="fence_and_cone_groups" expanded="1" legend_split_behavior="0" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" providerKey="virtual" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" legend_exp="" name="fence_and_cone_groups" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20,%20SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" providerKey="virtual">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group name="Markers" expanded="1" checked="Qt::Checked" groupLayer="">
+      <layer-tree-group name="Markers" expanded="1" groupLayer="" checked="Qt::Checked">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={392dec0f-b023-4796-b201-df13a63aa0a4}" patch_size="-1,-1" name="route_markers" expanded="1" legend_split_behavior="0" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" providerKey="memory" legend_exp="" checked="Qt::Checked">
-          <customproperties>
-            <Option type="Map">
-              <Option name="expandedLegendNodes"/>
-              <Option value="1" name="showFeatureCount" type="int"/>
-            </Option>
-          </customproperties>
-        </layer-tree-layer>
-        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)&amp;uid={86c95bbf-8adf-46bc-9c84-b2aee8f8f689}" patch_size="-1,-1" name="route_markers" expanded="1" legend_split_behavior="0" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" providerKey="memory" legend_exp="" checked="Qt::Unchecked">
+        <layer-tree-layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" legend_exp="" name="route_markers" legend_split_behavior="0" patch_size="-1,-1" expanded="1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" checked="Qt::Unchecked" providerKey="memory">
           <customproperties>
             <Option type="Map">
               <Option name="expandedLegendNodes" type="invalid"/>
@@ -118,7 +110,7 @@
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -127,16 +119,16 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer source="./timelapse.shp|layername=timelapse" patch_size="0,0" name="timelapse" expanded="0" legend_split_behavior="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" legend_exp="" name="timelapse" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000'" checked="Qt::Unchecked" providerKey="ogr">
       <customproperties>
         <Option/>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group name="Feeding Stations" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Feeding Stations" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./water_tables.shp" patch_size="0,0" name="water_tables" expanded="1" legend_split_behavior="0" id="water_tables20170921142016467" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="water_tables20170921142016467" legend_exp="" name="water_tables" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./water_tables.shp" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -144,67 +136,67 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Ask Me" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Ask Me" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" name="poi_labels" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" name="directions_to_start" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Residents Access" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Residents Access" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./mayor.shp" patch_size="0,0" name="mayor" expanded="1" legend_split_behavior="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" legend_exp="" name="mayor" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./mayor.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./viplabels.shp" patch_size="0,0" name="viplabels" expanded="1" legend_split_behavior="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" legend_exp="" name="viplabels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./viplabels.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./vipaccess.shp" patch_size="0,0" name="vipaccess" expanded="1" legend_split_behavior="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" legend_exp="" name="vipaccess" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./vipaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./golfaccess.shp" patch_size="0,0" name="golfaccess" expanded="0" legend_split_behavior="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" legend_exp="" name="golfaccess" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./golfaccess.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" name="residents_access_roads" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./residents_access.shp|layername=residents_access" patch_size="0,0" name="residents_access" expanded="1" legend_split_behavior="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" legend_exp="" name="residents_access" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="OSM data" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="OSM data" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./osm_roads.shp" patch_size="0,0" name="osm_roads" expanded="0" legend_split_behavior="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" legend_exp="" name="osm_roads" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./osm_roads.shp" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -212,7 +204,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./osm_places.shp|layername=osm_places" patch_size="0,0" name="osm_places" expanded="1" legend_split_behavior="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" legend_exp="" name="osm_places" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -221,18 +213,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Start and Finish pages" expanded="1" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Start and Finish pages" expanded="1" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./data-comments.shp" patch_size="0,0" name="data-comments" expanded="1" legend_split_behavior="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" legend_exp="" name="data-comments" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./data-comments.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="./start_finish_area.shp" patch_size="0,0" name="start_finish_area" expanded="1" legend_split_behavior="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" legend_exp="" name="start_finish_area" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./start_finish_area.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -240,11 +232,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Elevation" expanded="0" checked="Qt::Unchecked" groupLayer="">
+    <layer-tree-group name="Elevation" expanded="0" groupLayer="" checked="Qt::Unchecked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./capetownelevation-1m.shp" patch_size="0,0" name="capetownelevation-1m" expanded="1" legend_split_behavior="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" legend_exp="" checked="Qt::Unchecked">
+      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" legend_exp="" name="capetownelevation-1m" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" providerKey="ogr">
         <customproperties>
           <Option type="Map">
             <Option value="1" name="showFeatureCount" type="QString"/>
@@ -252,18 +244,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group name="Map" expanded="1" checked="Qt::Checked" groupLayer="">
+    <layer-tree-group name="Map" expanded="1" groupLayer="" checked="Qt::Checked">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" patch_size="0,0" name="GDAL-City of Cape Town 2015 Aerial" expanded="0" legend_split_behavior="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" legend_exp="" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" patch_size="0,0" expanded="0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" providerKey="gdal">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" patch_size="0,0" name="Outlines" expanded="1" legend_split_behavior="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" legend_exp="" checked="Qt::Checked">
+      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" legend_exp="" name="Outlines" legend_split_behavior="0" patch_size="0,0" expanded="1" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" providerKey="wms">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes"/>
@@ -298,38 +290,36 @@
       <item>fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb</item>
       <item>cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a</item>
       <item>cone_groups_a294cfec_698f_4117_9483_173a4f6655d2</item>
-      <item>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</item>
       <item>route_markers_022f7471_3d57_403e_b836_6019bd5d0709</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings mode="3" enabled="0" tolerance="10" scaleDependencyMode="0" unit="1" maxScale="0" type="1" intersection-snapping="1" minScale="0" self-snapping="1">
+  <snapping-settings enabled="0" maxScale="0" mode="3" tolerance="10" self-snapping="1" minScale="0" type="1" intersection-snapping="1" unit="1" scaleDependencyMode="0">
     <individual-layer-settings>
-      <layer-setting enabled="0" tolerance="12" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="0" id="extra_security20170921130834191" maxScale="0" type="2" minScale="0" units="2"/>
-      <layer-setting enabled="0" tolerance="12" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="1" tolerance="20" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" maxScale="0" type="0" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="0" id="water_tables20170921142016467" maxScale="0" type="2" minScale="0" units="2"/>
-      <layer-setting enabled="0" tolerance="12" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" maxScale="0" type="0" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" maxScale="0" type="1" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" maxScale="0" type="2" minScale="0" units="1"/>
-      <layer-setting enabled="0" tolerance="12" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" maxScale="0" type="2" minScale="0" units="1"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" enabled="1" maxScale="0" tolerance="20" minScale="0" type="2" units="1"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" enabled="0" maxScale="0" tolerance="12" minScale="0" type="0" units="1"/>
+      <layer-setting id="water_tables20170921142016467" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="extra_security20170921130834191" enabled="0" maxScale="0" tolerance="0" minScale="0" type="2" units="2"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" enabled="0" maxScale="0" tolerance="12" minScale="0" type="1" units="1"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" enabled="0" maxScale="0" tolerance="12" minScale="0" type="2" units="1"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -337,10 +327,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.40462507648904733</xmin>
-      <ymin>-33.91260376305159951</ymin>
-      <xmax>18.41657121417798493</xmax>
-      <ymax>-33.90048855131077943</ymax>
+      <xmin>18.39449634270076572</xmin>
+      <ymin>-33.90828503601445476</ymin>
+      <xmax>18.39585035230306787</xmax>
+      <ymax>-33.90669064043363079</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -361,176 +351,171 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup name="Marshals" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="marshal_positions" checked="Qt::Checked" open="true" showFeatureCount="1">
+    <legendgroup open="true" name="Marshals" checked="Qt::Checked">
+      <legendlayer open="true" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1"/>
+          <legendlayerfile layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="extra_security" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="extra_security20170921130834191" visible="0"/>
+          <legendlayerfile layerid="extra_security20170921130834191" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshals_by_position" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+      <legendlayer open="true" name="marshals_by_position" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshals_by_position20161003112326575" visible="0"/>
+          <legendlayerfile layerid="marshals_by_position20161003112326575" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="complete_marshal_overview" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" visible="0"/>
+          <legendlayerfile layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="marshal_overviews" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+      <legendlayer open="false" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" visible="0"/>
+          <legendlayerfile layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Fencing and Cones" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="fencing" checked="Qt::Checked" open="true" showFeatureCount="0">
+    <legendgroup open="true" name="Fencing and Cones" checked="Qt::Unchecked">
+      <legendlayer open="true" name="fencing" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0"/>
+          <legendlayerfile layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="cone_groups" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" visible="0"/>
+          <legendlayerfile layerid="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="fence_groups" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" visible="0"/>
+          <legendlayerfile layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="fence_and_cone_groups" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="fence_and_cone_groups" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" visible="0"/>
+          <legendlayerfile layerid="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Routes" checked="Qt::Checked" open="true">
-      <legendgroup name="Markers" checked="Qt::Checked" open="true">
-        <legendlayer drawingOrder="-1" name="route_markers" checked="Qt::Checked" open="true" showFeatureCount="1">
+    <legendgroup open="true" name="Routes" checked="Qt::Checked">
+      <legendgroup open="true" name="Markers" checked="Qt::Checked">
+        <legendlayer open="true" name="route_markers" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
           <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1"/>
-          </filegroup>
-        </legendlayer>
-        <legendlayer drawingOrder="-1" name="route_markers" checked="Qt::Unchecked" open="true" showFeatureCount="1">
-          <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" layerid="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549" visible="0"/>
+            <legendlayerfile layerid="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" isInOverview="0" visible="0"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer drawingOrder="-1" name="all_routes" checked="Qt::Checked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="all_routes" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1"/>
+          <legendlayerfile layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer drawingOrder="-1" name="timelapse" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+    <legendlayer open="false" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
       <filegroup open="false" hidden="false">
-        <legendlayerfile isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" visible="0"/>
+        <legendlayerfile layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" isInOverview="0" visible="0"/>
       </filegroup>
     </legendlayer>
-    <legendgroup name="Feeding Stations" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="water_tables" checked="Qt::Checked" open="true" showFeatureCount="0">
+    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
+      <legendlayer open="true" name="water_tables" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="water_tables20170921142016467" visible="1"/>
+          <legendlayerfile layerid="water_tables20170921142016467" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Ask Me" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="poi_labels" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
+      <legendlayer open="true" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="0"/>
+          <legendlayerfile layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="directions_to_start" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="0"/>
+          <legendlayerfile layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Residents Access" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="mayor" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
+      <legendlayer open="true" name="mayor" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" visible="0"/>
+          <legendlayerfile layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="viplabels" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" visible="0"/>
+          <legendlayerfile layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="vipaccess" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" visible="0"/>
+          <legendlayerfile layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="golfaccess" checked="Qt::Unchecked" open="false" showFeatureCount="0">
+      <legendlayer open="false" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" visible="0"/>
+          <legendlayerfile layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access_roads" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="0"/>
+          <legendlayerfile layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="residents_access" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" visible="0"/>
+          <legendlayerfile layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="OSM data" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="osm_roads" checked="Qt::Checked" open="false" showFeatureCount="1">
+    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
+      <legendlayer open="false" name="osm_roads" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1"/>
+          <legendlayerfile layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="osm_places" checked="Qt::Checked" open="true" showFeatureCount="1">
+      <legendlayer open="true" name="osm_places" showFeatureCount="1" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1"/>
+          <legendlayerfile layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Start and Finish pages" checked="Qt::Unchecked" open="true">
-      <legendlayer drawingOrder="-1" name="data-comments" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
+      <legendlayer open="true" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="0"/>
+          <legendlayerfile layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="start_finish_area" checked="Qt::Unchecked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" visible="0"/>
+          <legendlayerfile layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Elevation" checked="Qt::Unchecked" open="false">
-      <legendlayer drawingOrder="-1" name="capetownelevation-1m" checked="Qt::Unchecked" open="true" showFeatureCount="1">
+    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
+      <legendlayer open="true" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" visible="0"/>
+          <legendlayerfile layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" isInOverview="0" visible="0"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup name="Map" checked="Qt::Checked" open="true">
-      <legendlayer drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" checked="Qt::Checked" open="false" showFeatureCount="0">
+    <legendgroup open="true" name="Map" checked="Qt::Checked">
+      <legendlayer open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1"/>
+          <legendlayerfile layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
-      <legendlayer drawingOrder="-1" name="Outlines" checked="Qt::Checked" open="true" showFeatureCount="0">
+      <legendlayer open="true" name="Outlines" showFeatureCount="0" checked="Qt::Checked" drawingOrder="-1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1"/>
+          <legendlayerfile layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" isInOverview="0" visible="1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" maxScale="0" refreshOnNotifyEnabled="0" type="annotation" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="0">
+  <main-annotation-layer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="0" styleCategories="AllStyleCategories" type="annotation" refreshOnNotifyEnabled="0">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -591,7 +576,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" maxScale="100000" refreshOnNotifyEnabled="0" type="raster" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -657,7 +642,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -668,9 +653,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"/>
@@ -682,13 +667,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal enabled="0" mode="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" symbology="Line" band="1" zscale="1" zoffset="0">
+      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -697,7 +682,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -705,7 +690,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}">
+            <layer enabled="1" id="{0a97eb2f-da44-4f5f-aead-719fe50dca08}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -746,7 +731,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -754,7 +739,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31a148a7-0364-430a-b534-21f418a5bb1b}">
+            <layer enabled="1" id="{31a148a7-0364-430a-b534-21f418a5bb1b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -800,9 +785,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" enabled="false" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer blueBand="3" nodataColor="" redBand="1" alphaBand="-1" type="multibandcolor" opacity="0.5" greenBand="2">
+        <rasterrenderer blueBand="3" alphaBand="-1" opacity="0.5" type="multibandcolor" redBand="1" nodataColor="" greenBand="2">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -813,14 +798,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeBlue="128"/>
+        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
+        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshEnabled="0" refreshOnNotifyMessage="" legendPlaceholderImage="" maxScale="0" refreshOnNotifyEnabled="0" type="raster" hasScaleBasedVisibilityFlag="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="1e+08">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="0" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" type="raster" refreshOnNotifyEnabled="0">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -886,7 +871,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -897,7 +882,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"/>
@@ -909,13 +894,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal mode="0" enabled="0" fetchMode="0">
+      <temporal enabled="0" mode="0" fetchMode="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" symbology="Line" band="1" zscale="1" zoffset="0">
+      <elevation band="1" enabled="0" zoffset="0" symbology="Line" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -924,7 +909,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -932,7 +917,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}">
+            <layer enabled="1" id="{ab2448f5-c74e-411f-84e6-faf130ad83ae}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -973,7 +958,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -981,7 +966,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}">
+            <layer enabled="1" id="{6fd4fa0f-0d8b-4d7a-9d74-4f021e61f535}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -1027,9 +1012,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling zoomedInResamplingMethod="nearestNeighbour" maxOversampling="2" enabled="false" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling enabled="false" zoomedOutResamplingMethod="nearestNeighbour" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer nodataColor="" alphaBand="-1" band="1" type="singlebandcolordata" opacity="0.75">
+        <rasterrenderer band="1" alphaBand="-1" opacity="0.75" type="singlebandcolordata" nodataColor="">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1040,14 +1025,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" contrast="0" gamma="1"/>
-        <huesaturation colorizeRed="255" colorizeStrength="100" invertColors="0" colorizeOn="0" colorizeGreen="128" saturation="0" grayscaleMode="0" colorizeBlue="128"/>
+        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
+        <huesaturation colorizeOn="0" colorizeBlue="128" grayscaleMode="0" colorizeRed="255" colorizeStrength="100" saturation="0" invertColors="0" colorizeGreen="128"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1113,7 +1098,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="EPSG:4326" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1127,8 +1112,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="length_km" type="6" expression="$length * 100" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="length_m" type="6" expression="$length * 100 * 1000" comment="" subType="0" length="-1"/>
+        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1141,13 +1126,13 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="RouteLen" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="RouteLen" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -1156,7 +1141,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1164,7 +1149,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}">
+            <layer enabled="1" id="{14a5ec6d-a9d2-4221-909d-48fa947966db}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -1205,7 +1190,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1213,7 +1198,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}">
+            <layer enabled="1" id="{db5a3da3-b712-466f-bfe8-283f0f2ba8e9}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -1238,7 +1223,7 @@
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1246,7 +1231,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2821b303-e942-4f2b-95eb-71ba37854d84}">
+            <layer enabled="1" id="{2821b303-e942-4f2b-95eb-71ba37854d84}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -1279,19 +1264,19 @@
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" label="Show by day" filter="( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" symbol="0">
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="21KM" filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="1"/>
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="10KM" filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" symbol="2"/>
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" symbol="3"/>
-            <rule checkstate="0" description="This should be disabled, since it's only for legends" label="Trail" filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" symbol="4"/>
+          <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; )" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" label="Show by day" description="Only show when active in Atlas" symbol="0">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="21KM" description="This should be disabled, since it's only for legends" symbol="1"/>
+            <rule filter="&quot;Source&quot; = '10KM'" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" checkstate="0" label="10KM" description="This should be disabled, since it's only for legends" symbol="2"/>
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{871a9276-8278-4528-911c-7e434c0885d3}" checkstate="0" label="5KM" description="This should be disabled, since it's only for legends" symbol="3"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" checkstate="0" label="Trail" description="This should be disabled, since it's only for legends" symbol="4"/>
           </rule>
-          <rule checkstate="0" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="5"/>
-          <rule checkstate="0" label="Always show by day" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" symbol="6"/>
+          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" checkstate="0" label="Always show" symbol="5"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" checkstate="0" label="Always show by day" symbol="6"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1299,7 +1284,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}">
+            <layer enabled="1" id="{412cb9e1-6670-432f-ae39-3cf4bbfeea4e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1336,7 +1321,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1344,7 +1329,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c07399ea-beb4-4328-8240-a80a1288dc13}">
+                <layer enabled="1" id="{c07399ea-beb4-4328-8240-a80a1288dc13}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="0,0,0,255" name="color" type="QString"/>
@@ -1366,7 +1351,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@0@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -1374,7 +1359,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}">
+                    <layer enabled="1" id="{375106d8-ffb9-4433-8f42-bd7727c23e58}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -1406,7 +1391,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}">
+            <layer enabled="1" id="{84e1cc4e-1f6e-4749-98b4-edfb0819f38a}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -1455,7 +1440,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}">
+            <layer enabled="1" id="{1c6ea3ad-b426-4646-b786-88c35d759f75}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1481,7 +1466,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1489,7 +1474,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}">
+                <layer enabled="1" id="{f29062d5-8f7a-49df-a456-af79ffadebeb}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1527,7 +1512,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}">
+            <layer enabled="1" id="{87c064a3-aac8-4ba4-abce-e29e44df1c3f}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1553,7 +1538,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1561,7 +1546,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3d683642-1e02-4313-ae66-4b398724d7bc}">
+                <layer enabled="1" id="{3d683642-1e02-4313-ae66-4b398724d7bc}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1600,7 +1585,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1608,7 +1593,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{d9268524-45f1-4731-945d-c43780c8de62}">
+            <layer enabled="1" id="{d9268524-45f1-4731-945d-c43780c8de62}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1645,7 +1630,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1653,7 +1638,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}">
+                <layer enabled="1" id="{4ffecf71-81ad-4fe4-ae00-d54e1f324fe2}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="210,32,39,255" name="color" type="QString"/>
@@ -1675,7 +1660,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -1683,7 +1668,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}">
+                    <layer enabled="1" id="{9b5b108d-c657-4ac0-845f-5c8ed08e1201}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -1715,7 +1700,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}">
+            <layer enabled="1" id="{7477b43a-29ee-4418-a21d-1dcad56dad1c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -1764,7 +1749,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}">
+            <layer enabled="1" id="{903df944-a62b-4e12-b3c3-dd56eb016c50}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1790,7 +1775,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1798,7 +1783,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}">
+                <layer enabled="1" id="{e81ee1a1-0b60-48fb-a530-55ebd36628e8}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1836,7 +1821,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}">
+            <layer enabled="1" id="{dff28d26-7418-4637-8e01-7d3b2849d0a0}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1862,7 +1847,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1870,7 +1855,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}">
+                <layer enabled="1" id="{64671b77-2f8b-408e-a6d3-7d9156b47449}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -1909,7 +1894,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -1917,7 +1902,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}">
+            <layer enabled="1" id="{ba269cb0-0330-46d3-b1e6-b5fb2ce500d4}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -1954,7 +1939,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -1962,7 +1947,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}">
+                <layer enabled="1" id="{8c44ccfe-41f0-40ce-8139-2c85edc03e94}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -1984,7 +1969,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@2@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -1992,7 +1977,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}">
+                    <layer enabled="1" id="{1b1500dc-c190-4595-bdbf-e8423fd5b91a}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -2024,7 +2009,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}">
+            <layer enabled="1" id="{7a0ca1b6-e202-49ee-a623-e767ec01efca}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2073,7 +2058,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}">
+            <layer enabled="1" id="{b5b8805c-e2e8-4531-93b5-5c33be508ddc}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2099,7 +2084,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2107,7 +2092,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}">
+                <layer enabled="1" id="{3be01cea-3561-46b3-874e-2f8b60b1d683}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2145,7 +2130,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}">
+            <layer enabled="1" id="{88220b0d-a48b-45b5-aad8-3b42c6069888}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2171,7 +2156,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2179,7 +2164,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}">
+                <layer enabled="1" id="{1301f05d-956b-4df5-81cf-c5d2d5a244d9}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2218,7 +2203,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2226,7 +2211,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}">
+            <layer enabled="1" id="{afdde1a9-7af7-4e3f-b8d4-d222a2eea74f}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2263,7 +2248,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2271,7 +2256,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}">
+                <layer enabled="1" id="{cf206a90-562a-4b34-9a7b-fca1b2f43581}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="145,211,55,255" name="color" type="QString"/>
@@ -2293,7 +2278,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@3@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@3@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -2301,7 +2286,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}">
+                    <layer enabled="1" id="{3d6dc075-de3b-4a5e-a3d1-ab6c800f748b}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -2333,7 +2318,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}">
+            <layer enabled="1" id="{86368a63-ba22-4d2a-bd8c-a6714a838d45}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2382,7 +2367,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{09613930-5415-4f16-9126-06282c6e8ebe}">
+            <layer enabled="1" id="{09613930-5415-4f16-9126-06282c6e8ebe}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2408,7 +2393,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2416,7 +2401,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}">
+                <layer enabled="1" id="{cf4d48a2-53b9-4303-be52-d72abe37d3dc}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2454,7 +2439,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}">
+            <layer enabled="1" id="{f228a68e-e077-46d5-9f8d-cc94ecbf4daf}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2480,7 +2465,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2488,7 +2473,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}">
+                <layer enabled="1" id="{e3f164c6-7cca-41b1-a983-f00c0d49928c}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2527,7 +2512,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2535,7 +2520,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}">
+            <layer enabled="1" id="{38f6db2e-1a7f-4ce3-afc4-8a03e2beab35}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2572,7 +2557,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@4@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2580,7 +2565,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}">
+                <layer enabled="1" id="{1b2af79e-68a3-42df-b511-8ea4e218f9d6}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="0,72,255,255" name="color" type="QString"/>
@@ -2602,7 +2587,7 @@
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@4@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@4@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -2610,7 +2595,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}">
+                    <layer enabled="1" id="{f759534e-2fef-4a36-b9f7-bef95a44eb53}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -2642,7 +2627,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}">
+            <layer enabled="1" id="{49380994-5bc8-45ef-ac3f-eacbdafb56b7}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2691,7 +2676,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{536a9089-88ae-403e-a80e-164ca63e1aee}">
+            <layer enabled="1" id="{536a9089-88ae-403e-a80e-164ca63e1aee}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2717,7 +2702,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@4@2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2725,7 +2710,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}">
+                <layer enabled="1" id="{8f58777c-0c60-41db-9b75-06624dc32b3c}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2763,7 +2748,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}">
+            <layer enabled="1" id="{e037e3d8-7a32-4da1-8db0-84a89ee1ac36}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -2789,7 +2774,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@4@3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@4@3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -2797,7 +2782,7 @@
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}">
+                <layer enabled="1" id="{d62ab1ba-23a6-439f-a2ee-e40f8b61df8f}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -2836,7 +2821,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="5" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2844,7 +2829,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}">
+            <layer enabled="1" id="{379adaa5-8ea9-4c68-9276-3ab0f062f605}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2889,7 +2874,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="6" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="6" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -2897,7 +2882,7 @@
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}">
+            <layer enabled="1" id="{7b5b61bb-57fc-48ca-9378-f147f44dc672}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -2949,14 +2934,14 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{064eef02-df9e-463c-8751-4b7fad6f7d48}">
-          <rule active="0" description="Active routes" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{9975d16f-40da-4a85-9213-5f1b0f651928}" active="0" description="Active routes">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="round($length / 1000, 0)" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round($length / 1000, 0)" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -2964,7 +2949,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -2995,7 +2980,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -3003,7 +2988,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -3038,7 +3023,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -3048,9 +3033,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="km_marker()" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="LineGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="1" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="1" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3101,7 +3086,7 @@
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -3115,14 +3100,14 @@
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Route lengths" key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}">
+          <rule key="{2496b9d5-7c35-4fea-b91e-9eee69c2dda0}" active="0" description="Route lengths">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="round( $length * 100, 4 )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100, 4 )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -3130,7 +3115,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -3161,7 +3146,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -3169,7 +3154,7 @@
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -3204,7 +3189,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -3214,9 +3199,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="km_marker()" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="LineGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="50" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapAtNoCost" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="km_marker()" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapAtNoCost" repeatDistance="50" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3267,7 +3252,7 @@
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{62e36c07-b467-4de9-b717-609d63d2663a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -3292,6 +3277,7 @@
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;Name&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
           <Option value="0" name="embeddedWidgets/count" type="QString"/>
           <Option name="variableNames" type="invalid"/>
@@ -3302,11 +3288,11 @@
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -3314,7 +3300,7 @@
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{99bd229d-7319-436f-b616-1be11812c381}">
+              <layer enabled="1" id="{99bd229d-7319-436f-b616-1be11812c381}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -3356,7 +3342,7 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3365,14 +3351,14 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3382,7 +3368,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3392,7 +3378,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3402,7 +3388,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3412,7 +3398,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3422,21 +3408,21 @@
             </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="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3446,7 +3432,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3456,7 +3442,7 @@
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -3468,16 +3454,16 @@
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="begin"/>
-        <alias index="2" name="" field="end"/>
-        <alias index="3" name="" field="Distance"/>
-        <alias index="4" name="" field="RouteLen"/>
-        <alias index="5" name="" field="Sort"/>
-        <alias index="6" name="" field="day"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="length_m"/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -3492,61 +3478,61 @@
         <policy field="length_m" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <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="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="length_km" type="6" expression="$length * 100" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="length_m" type="6" expression="$length * 100 * 1000" comment="" subType="0" length="-1"/>
+        <field expression="$length * 100" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_km" type="6"/>
+        <field expression="$length * 100 * 1000" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="length_m" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
-          <column name="Name" width="121" type="field" hidden="0"/>
-          <column name="begin" width="141" type="field" hidden="0"/>
-          <column name="end" width="31" type="field" hidden="0"/>
-          <column name="Distance" width="66" type="field" hidden="0"/>
+          <column width="121" name="Name" type="field" hidden="0"/>
+          <column width="141" name="begin" type="field" hidden="0"/>
+          <column width="31" name="end" type="field" hidden="0"/>
+          <column width="66" name="Distance" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="RouteLen" width="39" type="field" hidden="0"/>
-          <column name="Source" width="250" type="field" hidden="0"/>
-          <column name="length_m" width="175" type="field" hidden="0"/>
-          <column name="Sort" width="50" type="field" hidden="0"/>
-          <column name="day" width="31" type="field" hidden="0"/>
-          <column name="length_km" width="266" type="field" hidden="0"/>
+          <column width="39" name="RouteLen" type="field" hidden="0"/>
+          <column width="250" name="Source" type="field" hidden="0"/>
+          <column width="175" name="length_m" type="field" hidden="0"/>
+          <column width="50" name="Sort" type="field" hidden="0"/>
+          <column width="31" name="day" type="field" hidden="0"/>
+          <column width="266" name="length_km" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -3606,25 +3592,25 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -3698,13 +3684,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -3713,7 +3699,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3721,7 +3707,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}">
+            <layer enabled="1" id="{d0e4ed44-13da-41ec-94ce-3afbc45ed1c9}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -3762,7 +3748,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3770,7 +3756,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}">
+            <layer enabled="1" id="{dc79a7ba-a661-4a25-851e-5bc23a98965d}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -3795,7 +3781,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3803,7 +3789,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53b6bbaf-4722-434f-a142-936b95477967}">
+            <layer enabled="1" id="{53b6bbaf-4722-434f-a142-936b95477967}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -3836,9 +3822,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -3846,7 +3832,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}">
+            <layer enabled="1" id="{27f0813d-66e1-4660-ab6e-66965f8fcfb0}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -3899,28 +3885,28 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -3929,9 +3915,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="ID"/>
-        <alias index="1" name="" field="height"/>
-        <alias index="2" name="" field="elevation"/>
+        <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"/>
@@ -3939,25 +3925,25 @@ def my_form_open(dialog, layer, feature):
         <policy field="elevation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="ID"/>
-        <default applyOnUpdate="0" expression="" field="height"/>
-        <default applyOnUpdate="0" expression="" field="elevation"/>
+        <default expression="" applyOnUpdate="0" field="ID"/>
+        <default expression="" applyOnUpdate="0" field="height"/>
+        <default expression="" applyOnUpdate="0" field="elevation"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="ID" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="height" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="elevation" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="ID" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="height" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="elevation" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="ID" exp=""/>
-        <constraint desc="" field="height" exp=""/>
-        <constraint desc="" field="elevation" exp=""/>
+        <constraint desc="" exp="" field="ID"/>
+        <constraint desc="" exp="" field="height"/>
+        <constraint desc="" exp="" field="elevation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -3980,7 +3966,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -4056,13 +4042,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4071,7 +4057,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4079,7 +4065,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}">
+            <layer enabled="1" id="{541d9d1e-081a-4f85-bc90-c612fd8fa647}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -4120,7 +4106,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4128,7 +4114,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}">
+            <layer enabled="1" id="{31c18f39-0487-42ad-ad35-651f9ab7b09d}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4153,7 +4139,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4161,7 +4147,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}">
+            <layer enabled="1" id="{1880865e-e5e1-4936-8c97-9d2a6866e812}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -4194,9 +4180,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4204,7 +4190,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}">
+            <layer enabled="1" id="{1948ee46-fc32-4fc2-b18a-1b6f25e27d28}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4241,37 +4227,37 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -4280,10 +4266,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <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"/>
@@ -4292,28 +4278,28 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="page" exp=""/>
-        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -4336,7 +4322,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4402,7 +4388,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -4431,13 +4417,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4446,7 +4432,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4454,7 +4440,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -4495,7 +4481,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4503,7 +4489,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4528,7 +4514,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4536,7 +4522,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -4569,9 +4555,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4579,7 +4565,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -4623,11 +4609,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="1" spacing="5" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="0" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" style="0" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -4635,7 +4621,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -4677,7 +4663,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4686,7 +4672,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -4696,45 +4682,45 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="cone_len">
+        <field name="cone_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -4743,12 +4729,12 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="day"/>
-        <alias index="4" name="" field="fence_len"/>
-        <alias index="5" name="" field="cone_len"/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
+        <alias name="" index="5" field="cone_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -4759,40 +4745,40 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="fence_len" exp=""/>
-        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" width="306" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
+          <column width="306" name="name" type="field" hidden="0"/>
+          <column width="-1" name="group" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="cone_len" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -4839,18 +4825,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -4926,13 +4912,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -4941,7 +4927,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4949,7 +4935,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}">
+            <layer enabled="1" id="{2f2b5916-08f2-4873-9ef2-870a11520ea5}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -4990,7 +4976,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -4998,7 +4984,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{9fd55fce-62b5-4989-a948-622d8a60e362}">
+            <layer enabled="1" id="{9fd55fce-62b5-4989-a948-622d8a60e362}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -5023,7 +5009,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5031,7 +5017,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}">
+            <layer enabled="1" id="{243c76f1-0260-4ba4-b659-0874d10f8d0a}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -5064,9 +5050,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5074,7 +5060,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}">
+            <layer enabled="1" id="{2c5ad280-36b5-44b9-8e03-e32e18ccdc69}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -5118,11 +5104,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="1" spacing="5" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="0" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" underline="0" style="0" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="5" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="1" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="0" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,-1,11,255,5,0,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5130,7 +5116,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}">
+              <layer enabled="1" id="{e59cdd90-434b-4f6b-8101-ddaf66563004}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -5172,7 +5158,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5181,7 +5167,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -5191,38 +5177,38 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -5231,11 +5217,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="day"/>
-        <alias index="4" name="" field="cone_len"/>
+        <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"/>
@@ -5245,38 +5231,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" width="306" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column width="306" name="name" type="field" hidden="0"/>
+          <column width="-1" name="group" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="cone_len" type="field" hidden="0"/>
+          <column width="-1" name="fence_len" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -5323,18 +5309,18 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -5400,7 +5386,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5425,13 +5411,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5440,7 +5426,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5448,7 +5434,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}">
+            <layer enabled="1" id="{39abe117-4c40-4b98-8153-a50e8a3c5fa5}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -5489,7 +5475,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5497,7 +5483,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}">
+            <layer enabled="1" id="{83b621ad-18c7-420a-9aab-aeb77bf74b0f}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -5522,7 +5508,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5530,7 +5516,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}">
+            <layer enabled="1" id="{8ec06ff3-2a11-4854-88dd-ffd56fe52c5c}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -5563,9 +5549,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5573,7 +5559,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}">
+            <layer enabled="1" id="{b771cbe8-2803-42b9-8b9f-707c15e70c4c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -5618,12 +5604,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="Name" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="Name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -5631,7 +5617,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -5655,7 +5641,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5665,9 +5651,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="LineGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="2" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+          <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="LineGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -5687,7 +5673,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{8ede72b1-9711-40e1-bc73-66524ce1c23f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -5716,11 +5702,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -5728,7 +5714,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}">
+              <layer enabled="1" id="{7fbeedae-1042-4c1e-9ee3-444aa3f9d6c8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -5770,7 +5756,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5779,21 +5765,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -5802,33 +5788,33 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="Name" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Name"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="Name" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -5874,7 +5860,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="0" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -5940,7 +5926,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -5965,13 +5951,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -5980,7 +5966,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -5988,7 +5974,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{648e55d2-e73b-45b7-bf24-689efea25f17}">
+            <layer enabled="1" id="{648e55d2-e73b-45b7-bf24-689efea25f17}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -6029,7 +6015,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6037,7 +6023,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}">
+            <layer enabled="1" id="{c9c9e8c7-0dfb-4b80-9f0a-05249daf09bf}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -6062,7 +6048,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6070,7 +6056,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}">
+            <layer enabled="1" id="{f8afb303-1e69-416a-9c9b-55ed02b33766}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -6103,14 +6089,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule description="Only show when active in Atlas" label="21KM" filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" symbol="0"/>
-          <rule description="Only show when active in Atlas" label="10KM" filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" symbol="1"/>
-          <rule description="Only show when active in Atlas" label="5KM" filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" symbol="2"/>
+          <rule filter="&quot;distance&quot; = '21KM'" key="{85adf11b-f941-44b6-8847-c828ab845cdc}" label="21KM" description="Only show when active in Atlas" symbol="0"/>
+          <rule filter="&quot;distance&quot; = '10KM'" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" label="10KM" description="Only show when active in Atlas" symbol="1"/>
+          <rule filter="&quot;distance&quot; = '5KM'" key="{cf733f0f-ab72-441e-b213-841aa39c1671}" label="5KM" description="Only show when active in Atlas" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6118,7 +6104,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}">
+            <layer enabled="1" id="{15b2cd2e-d35b-4a6d-ba54-dc6bf43d7f41}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6144,7 +6130,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6152,7 +6138,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{a6a584bd-d0ac-4682-949e-960321bee388}">
+                <layer enabled="1" id="{a6a584bd-d0ac-4682-949e-960321bee388}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -6184,7 +6170,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}">
+            <layer enabled="1" id="{5b834de2-0716-4499-9f5a-f8a0b7622ccb}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6221,7 +6207,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@0@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6229,7 +6215,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}">
+                <layer enabled="1" id="{e0f6bdaa-bffb-4c54-897c-d8ce0549e1db}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="210,32,39,255" name="color" type="QString"/>
@@ -6251,7 +6237,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@0@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@0@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6259,7 +6245,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2967078f-5e58-40bd-b0c8-aabffd928676}">
+                    <layer enabled="1" id="{2967078f-5e58-40bd-b0c8-aabffd928676}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6285,7 +6271,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}">
+            <layer enabled="1" id="{fa2e931f-e1a1-492d-a092-f2b1833ba662}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -6324,7 +6310,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6332,7 +6318,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{eab0a889-d082-476e-b081-a39cd87a440e}">
+            <layer enabled="1" id="{eab0a889-d082-476e-b081-a39cd87a440e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6369,7 +6355,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6377,7 +6363,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}">
+                <layer enabled="1" id="{8af4d1dd-523c-4887-a603-8238496f1e2c}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -6399,7 +6385,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6407,7 +6393,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c53a1ec5-544c-48d2-961a-03466d491afc}">
+                    <layer enabled="1" id="{c53a1ec5-544c-48d2-961a-03466d491afc}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6433,7 +6419,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}">
+            <layer enabled="1" id="{9cb2fb3e-95d5-4391-bf5a-29ca8cb3d651}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6470,7 +6456,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6478,7 +6464,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}">
+                <layer enabled="1" id="{4b18a74e-1551-42f1-b96a-73f2fb09f2e0}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -6500,7 +6486,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6508,7 +6494,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{43e5e783-9402-4471-b264-9b43c9035744}">
+                    <layer enabled="1" id="{43e5e783-9402-4471-b264-9b43c9035744}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6534,7 +6520,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}">
+            <layer enabled="1" id="{9ffea0b4-4940-4dcf-9553-865b28a97639}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -6573,7 +6559,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -6581,7 +6567,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}">
+            <layer enabled="1" id="{147f2b41-6c48-4461-bf38-c05e2bdabf99}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6618,7 +6604,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6626,7 +6612,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}">
+                <layer enabled="1" id="{06aa2f20-0143-4a34-9c67-587b1b1c3e8e}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="69,100,25,255" name="color" type="QString"/>
@@ -6648,7 +6634,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@0@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@2@0@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6656,7 +6642,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}">
+                    <layer enabled="1" id="{d6d8bbed-4372-4dbc-88fe-5e06e33573a4}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6682,7 +6668,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{579d1121-5712-48ef-b839-b461ebde82d6}">
+            <layer enabled="1" id="{579d1121-5712-48ef-b839-b461ebde82d6}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -6719,7 +6705,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -6727,7 +6713,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}">
+                <layer enabled="1" id="{0fb71c5d-acbb-4021-a9e1-50568fc809d1}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="69,100,25,255" name="color" type="QString"/>
@@ -6749,7 +6735,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@2@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@2@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -6757,7 +6743,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}">
+                    <layer enabled="1" id="{1796ed19-8900-43f7-ae69-7723ce9c7fb9}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -6783,7 +6769,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}">
+            <layer enabled="1" id="{daa2b3ee-fcaa-4240-8a45-cd3a870629e1}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -6842,11 +6828,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -6854,7 +6840,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}">
+              <layer enabled="1" id="{80adc82c-4020-44af-b7cc-12992d1d9fe1}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -6896,7 +6882,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -6905,21 +6891,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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">
@@ -6931,34 +6917,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="Distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Distance&quot;">
         <columns>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="Distance" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7021,7 +7007,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -7095,13 +7081,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7110,7 +7096,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7118,7 +7104,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}">
+            <layer enabled="1" id="{f98e5c4c-872f-41e8-a2e9-5666af738e23}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -7159,7 +7145,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7167,7 +7153,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}">
+            <layer enabled="1" id="{adf570f3-d3cd-4f03-ab2c-e7de148cb0b3}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -7192,7 +7178,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7200,7 +7186,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}">
+            <layer enabled="1" id="{da0b6352-626c-4ed9-80ae-9052234cbeb9}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -7233,9 +7219,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.796078">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.796078" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -7243,7 +7229,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}">
+            <layer enabled="1" id="{c0b0ea0d-2a2d-404d-ba7f-5993f728748f}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -7286,14 +7272,14 @@ 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" filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" key="{9ea624c1-7179-4746-8777-84b8008475a1}" description="Show in marshal maps">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -7301,7 +7287,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -7331,7 +7317,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -7367,9 +7353,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="1" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="1" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -7420,7 +7406,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3fa654d1-a3b9-4e23-b2fb-5360ca8b0ac3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -7434,14 +7420,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal overview" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" description="Show in marshal overview">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="227,0,185,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="4" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="4" textColor="227,0,185,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -7449,7 +7435,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -7479,7 +7465,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -7500,9 +7486,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="1" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="2" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -7538,7 +7524,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{c379efa9-6123-4555-a5f9-d0ac9efbfb42}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -7703,11 +7689,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -7715,7 +7701,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}">
+              <layer enabled="1" id="{4b343717-1e6e-45db-9c96-a3c1a5219761}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -7757,7 +7743,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="10" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="10" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -7766,14 +7752,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7783,7 +7769,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7793,7 +7779,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -7805,9 +7791,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
+        <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"/>
@@ -7815,30 +7801,30 @@ def my_form_open(dialog, layer, feature):
         <policy field="type" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="position" exp=""/>
-        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="position" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -7914,7 +7900,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Polygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Polygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37682610786999859</xmin>
         <ymin>-33.94240746638465822</ymin>
@@ -7980,7 +7966,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8009,13 +7995,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8024,7 +8010,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8032,7 +8018,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}">
+            <layer enabled="1" id="{c2db69f3-2b12-45cc-a5b3-e83f2bb131af}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -8073,7 +8059,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8081,7 +8067,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}">
+            <layer enabled="1" id="{09ea61ec-261c-4832-8d0d-9aeefb61abb1}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -8106,7 +8092,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8114,7 +8100,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}">
+            <layer enabled="1" id="{5e1b4818-a54d-43eb-8dbe-a38330e48894}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -8147,9 +8133,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8157,7 +8143,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}">
+            <layer enabled="1" id="{b0e82c35-3cbe-4563-91af-1923ea993fa7}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -8201,11 +8187,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -8213,7 +8199,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d22f44d7-7a5a-427f-afda-732ba2664339}">
+              <layer enabled="1" id="{d22f44d7-7a5a-427f-afda-732ba2664339}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -8255,7 +8241,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8264,7 +8250,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -8274,38 +8260,38 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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="fence_len">
+        <field name="fence_len" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -8314,11 +8300,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="name"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="day"/>
-        <alias index="4" name="" field="fence_len"/>
+        <alias name="" index="0" field="name"/>
+        <alias name="" index="1" field="group"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="day"/>
+        <alias name="" index="4" field="fence_len"/>
       </aliases>
       <splitPolicies>
         <policy field="name" policy="Duplicate"/>
@@ -8328,39 +8314,39 @@ def my_form_open(dialog, layer, feature):
         <policy field="fence_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="fence_len" exp=""/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="name" width="415" type="field" hidden="0"/>
-          <column name="group" width="-1" type="field" hidden="0"/>
+          <column width="415" name="name" type="field" hidden="0"/>
+          <column width="-1" name="group" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="cone_len" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="fence_len" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="cone_len" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="fence_len" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8408,19 +8394,19 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -8486,7 +8472,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="EPSG:4326" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="EPSG:4326" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8500,42 +8486,42 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="cone_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" subType="0" length="-1"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyMaxScale="1" readOnly="0" simplifyDrawingHints="1" simplifyLocal="1" labelsEnabled="1" simplifyAlgorithm="0" simplifyDrawingTol="1" maxScale="0" hasScaleBasedVisibilityFlag="0" styleCategories="AllStyleCategories" minScale="1e+08" version="3.8.3-Zanzibar">
+          <qgis simplifyAlgorithm="0" maxScale="0" hasScaleBasedVisibilityFlag="0" simplifyDrawingTol="1" labelsEnabled="1" simplifyMaxScale="1" minScale="1e+08" simplifyDrawingHints="1" styleCategories="AllStyleCategories" readOnly="0" version="3.8.3-Zanzibar" simplifyLocal="1">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" symbollevels="1" enableorderby="0" type="RuleRenderer">
+            <renderer-v2 enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" label="Visible" symbol="0"/>
               </rules>
               <symbols>
-                <symbol name="0" force_rhr="0" type="line" clip_to_extent="1" alpha="1">
-                  <layer locked="0" pass="0" enabled="1" class="SimpleLine">
-                    <prop v="square" k="capstyle"/>
-                    <prop v="5;2" k="customdash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
-                    <prop v="MM" k="customdash_unit"/>
-                    <prop v="0" k="draw_inside_polygon"/>
-                    <prop v="bevel" k="joinstyle"/>
-                    <prop v="255,255,0,255" k="line_color"/>
-                    <prop v="solid" k="line_style"/>
-                    <prop v="0.5" k="line_width"/>
-                    <prop v="MM" k="line_width_unit"/>
-                    <prop v="0" k="offset"/>
-                    <prop v="3x:0,0,0,0,0,0" k="offset_map_unit_scale"/>
-                    <prop v="MM" k="offset_unit"/>
-                    <prop v="0" k="ring_filter"/>
-                    <prop v="0" k="use_custom_dash"/>
-                    <prop v="3x:0,0,0,0,0,0" k="width_map_unit_scale"/>
+                <symbol name="0" type="line" alpha="1" force_rhr="0" clip_to_extent="1">
+                  <layer enabled="1" locked="0" pass="0" class="SimpleLine">
+                    <prop k="capstyle" v="square"/>
+                    <prop k="customdash" v="5;2"/>
+                    <prop k="customdash_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="customdash_unit" v="MM"/>
+                    <prop k="draw_inside_polygon" v="0"/>
+                    <prop k="joinstyle" v="bevel"/>
+                    <prop k="line_color" v="255,255,0,255"/>
+                    <prop k="line_style" v="solid"/>
+                    <prop k="line_width" v="0.5"/>
+                    <prop k="line_width_unit" v="MM"/>
+                    <prop k="offset" v="0"/>
+                    <prop k="offset_map_unit_scale" v="3x:0,0,0,0,0,0"/>
+                    <prop k="offset_unit" v="MM"/>
+                    <prop k="ring_filter" v="0"/>
+                    <prop k="use_custom_dash" v="0"/>
+                    <prop k="width_map_unit_scale" v="3x:0,0,0,0,0,0"/>
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -8549,17 +8535,17 @@ 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 fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" isExpression="0" multilineHeight="1" fontLetterSpacing="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fieldName="comment" fontWeight="50" textOpacity="0.8" useSubstitutions="0" namedStyle="Regular" fontWordSpacing="0" fontUnderline="0" fontSize="11" blendMode="0" fontItalic="0" fontSizeUnit="Point">
-                      <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-                      <background shapeJoinStyle="128" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.6" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="1" shapeDraw="1" shapeSizeType="0" shapeOpacity="0.6" shapeFillColor="255,255,255,255" shapeBorderColor="255,255,0,255" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="1" shapeRotation="0" shapeRadiiY="1"/>
-                      <shadow shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetDist="1"/>
+                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Regular" fontWeight="50" blendMode="0" fieldName="comment" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" useSubstitutions="0" isExpression="0" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="0.8">
+                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.6" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.6" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0"/>
+                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" yOffset="0" repeatDistanceUnits="MM" priority="5" offsetType="0" preserveRotation="1" dist="5" centroidInside="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" maxCurvedCharAngleIn="25" offsetUnits="MM" xOffset="0" geometryGeneratorEnabled="0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" rotationAngle="0" distUnits="MM" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0"/>
-                    <rendering mergeLines="1" limitNumLabels="0" displayAll="1" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" minFeatureSize="0" scaleMin="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
+                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="2" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="5" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
+                    <rendering obstacleType="0" displayAll="1" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -8580,17 +8566,17 @@ def my_form_open(dialog, layer, feature):
                     </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 fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontCapitals="0" isExpression="1" multilineHeight="1" fontLetterSpacing="0" fontStrikeout="0" fontFamily="Myriad Pro" previewBkgrdColor="#ffffff" textColor="0,0,0,255" fieldName="round( $length, 1) || 'm'" fontWeight="63" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" fontWordSpacing="0" fontUnderline="0" fontSize="12" blendMode="0" fontItalic="0" fontSizeUnit="Point">
-                      <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                      <background shapeJoinStyle="64" shapeOffsetX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeOpacity="1" shapeFillColor="255,255,255,255" shapeBorderColor="128,128,128,255" shapeOffsetY="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRadiiX="0" shapeRotation="0" shapeRadiiY="0"/>
-                      <shadow shadowDraw="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowOpacity="0.7" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowUnder="0" shadowOffsetDist="1"/>
+                    <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontUnderline="0" fontCapitals="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" namedStyle="Semibold" fontWeight="63" blendMode="0" fieldName="round( $length, 1) || 'm'" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" useSubstitutions="0" isExpression="1" previewBkgrdColor="#ffffff" multilineHeight="1" textOpacity="1">
+                      <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                      <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeBorderWidthUnit="MM" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0"/>
+                      <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.7" shadowOffsetUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowScale="100" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetAngle="135"/>
                       <substitutions/>
                     </text-style>
-                    <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                    <placement maxCurvedCharAngleOut="-25" geometryGenerator="" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" centroidWhole="0" yOffset="0" repeatDistanceUnits="MM" priority="5" offsetType="0" preserveRotation="1" dist="1" centroidInside="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" maxCurvedCharAngleIn="25" offsetUnits="MM" xOffset="0" geometryGeneratorEnabled="0" repeatDistance="0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" rotationAngle="0" distUnits="MM" geometryGeneratorType="PointGeometry" fitInPolygonOnly="0"/>
-                    <rendering mergeLines="0" limitNumLabels="0" displayAll="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" minFeatureSize="0" scaleMin="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+                    <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;"/>
+                    <placement geometryGenerator="" maxCurvedCharAngleOut="-25" fitInPolygonOnly="0" rotationAngle="0" placementFlags="15" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" priority="5" xOffset="0" preserveRotation="1" centroidWhole="0" offsetType="0" centroidInside="0" yOffset="0" distMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" dist="1" repeatDistanceUnits="MM" geometryGeneratorType="PointGeometry" distUnits="MM" repeatDistance="0"/>
+                    <rendering obstacleType="0" displayAll="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -8623,12 +8609,12 @@ def my_form_open(dialog, layer, feature):
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
             <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory opacity="1" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" backgroundAlpha="255" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" labelPlacementMethod="XHeight">
-                <fontProperties description="Sans Serif,9,-1,5,50,0,0,0,0,0" style=""/>
-                <attribute label="" color="#000000" field=""/>
+              <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" barWidth="5" backgroundColor="#ffffff" minScaleDenominator="0" lineSizeType="MM" lineSizeScale="3x:0,0,0,0,0,0" opacity="1" scaleDependency="Area" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+                <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
+                <attribute color="#000000" label="" field=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings priority="0" placement="2" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+            <DiagramLayerSettings priority="0" obstacle="0" zIndex="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
               <properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -8637,7 +8623,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -8721,81 +8707,81 @@ def my_form_open(dialog, layer, feature):
               </field>
             </fieldConfiguration>
             <aliases>
-              <alias index="0" name="" field="id"/>
-              <alias index="1" name="" field="group"/>
-              <alias index="2" name="" field="comment"/>
-              <alias index="3" name="" field="moveable"/>
-              <alias index="4" name="" field="type"/>
-              <alias index="5" name="" field="name"/>
-              <alias index="6" name="" field="hidden"/>
-              <alias index="7" name="" field="auxiliary_storage_labeling_positiony"/>
-              <alias index="8" name="" field="auxiliary_storage_labeling_positionx"/>
-              <alias index="9" name="" field="fence_len"/>
-              <alias index="10" name="" field="cone_len"/>
+              <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 applyOnUpdate="0" expression="" field="id"/>
-              <default applyOnUpdate="0" expression="" field="group"/>
-              <default applyOnUpdate="0" expression="" field="comment"/>
-              <default applyOnUpdate="0" expression="" field="moveable"/>
-              <default applyOnUpdate="0" expression="" field="type"/>
-              <default applyOnUpdate="0" expression="" field="name"/>
-              <default applyOnUpdate="0" expression="" field="hidden"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positiony"/>
-              <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_positionx"/>
-              <default applyOnUpdate="0" expression="" field="fence_len"/>
-              <default applyOnUpdate="0" expression="" field="cone_len"/>
+              <default expression="" applyOnUpdate="0" field="id"/>
+              <default expression="" applyOnUpdate="0" field="group"/>
+              <default expression="" applyOnUpdate="0" field="comment"/>
+              <default expression="" applyOnUpdate="0" field="moveable"/>
+              <default expression="" applyOnUpdate="0" field="type"/>
+              <default expression="" applyOnUpdate="0" field="name"/>
+              <default expression="" applyOnUpdate="0" field="hidden"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positiony"/>
+              <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_positionx"/>
+              <default expression="" applyOnUpdate="0" field="fence_len"/>
+              <default expression="" applyOnUpdate="0" field="cone_len"/>
             </defaults>
             <constraints>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positiony" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_positionx" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
-              <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positiony" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_positionx" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+              <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint desc="" field="id" exp=""/>
-              <constraint desc="" field="group" exp=""/>
-              <constraint desc="" field="comment" exp=""/>
-              <constraint desc="" field="moveable" exp=""/>
-              <constraint desc="" field="type" exp=""/>
-              <constraint desc="" field="name" exp=""/>
-              <constraint desc="" field="hidden" exp=""/>
-              <constraint desc="" field="auxiliary_storage_labeling_positiony" exp=""/>
-              <constraint desc="" field="auxiliary_storage_labeling_positionx" exp=""/>
-              <constraint desc="" field="fence_len" exp=""/>
-              <constraint desc="" field="cone_len" exp=""/>
+              <constraint desc="" exp="" field="id"/>
+              <constraint desc="" exp="" field="group"/>
+              <constraint desc="" exp="" field="comment"/>
+              <constraint desc="" exp="" field="moveable"/>
+              <constraint desc="" exp="" field="type"/>
+              <constraint desc="" exp="" field="name"/>
+              <constraint desc="" exp="" field="hidden"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positiony"/>
+              <constraint desc="" exp="" field="auxiliary_storage_labeling_positionx"/>
+              <constraint desc="" exp="" field="fence_len"/>
+              <constraint desc="" exp="" field="cone_len"/>
             </constraintExpressions>
             <expressionfields>
-              <field precision="0" typeName="double precision" name="fence_len" type="6" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" subType="0" length="-1"/>
-              <field precision="0" typeName="double precision" name="fence_len" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" subType="0" length="-1"/>
-              <field precision="0" typeName="double precision" name="cone_len" type="6" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" subType="0" length="-1"/>
+              <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="fence_len" type="6"/>
+              <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" subType="0" length="-1" comment="" typeName="double precision" name="cone_len" type="6"/>
             </expressionfields>
             <attributeactions>
               <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig sortOrder="0" sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown">
+            <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;group&quot;">
               <columns>
-                <column name="id" width="-1" type="field" hidden="0"/>
-                <column name="group" width="-1" type="field" hidden="0"/>
+                <column width="-1" name="id" type="field" hidden="0"/>
+                <column width="-1" name="group" type="field" hidden="0"/>
                 <column width="-1" type="actions" hidden="1"/>
-                <column name="comment" width="223" type="field" hidden="0"/>
-                <column name="moveable" width="-1" type="field" hidden="0"/>
-                <column name="type" width="-1" type="field" hidden="0"/>
-                <column name="name" width="414" type="field" hidden="0"/>
-                <column name="hidden" width="-1" type="field" hidden="0"/>
-                <column name="fence_len" width="-1" type="field" hidden="0"/>
-                <column name="cone_len" width="-1" type="field" hidden="0"/>
-                <column name="auxiliary_storage_labeling_positiony" width="-1" type="field" hidden="1"/>
-                <column name="auxiliary_storage_labeling_positionx" width="-1" type="field" hidden="1"/>
+                <column width="223" name="comment" type="field" hidden="0"/>
+                <column width="-1" name="moveable" type="field" hidden="0"/>
+                <column width="-1" name="type" type="field" hidden="0"/>
+                <column width="414" name="name" type="field" hidden="0"/>
+                <column width="-1" name="hidden" type="field" hidden="0"/>
+                <column width="-1" name="fence_len" type="field" hidden="0"/>
+                <column width="-1" name="cone_len" type="field" hidden="0"/>
+                <column width="-1" name="auxiliary_storage_labeling_positiony" type="field" hidden="1"/>
+                <column width="-1" name="auxiliary_storage_labeling_positionx" type="field" hidden="1"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -8868,13 +8854,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -8883,7 +8869,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8891,7 +8877,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b24077c4-36ed-44b5-830f-d1243f319030}">
+            <layer enabled="1" id="{b24077c4-36ed-44b5-830f-d1243f319030}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -8932,7 +8918,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8940,7 +8926,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}">
+            <layer enabled="1" id="{81f66c31-b5a2-49d3-afd1-02b7689f5919}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -8965,7 +8951,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -8973,7 +8959,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}">
+            <layer enabled="1" id="{b240180c-f59a-4dbd-a750-c3204efd6d54}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -9006,19 +8992,19 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="1" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="1">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule label="Show in fencing maps" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
-            <rule label="Cones" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" symbol="0"/>
-            <rule label="Moveable fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" symbol="1"/>
-            <rule label="Fixed fences" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" symbol="2"/>
-            <rule label="Construction" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" symbol="3"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" label="Show in fencing maps">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" label="Cones" symbol="0"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" label="Moveable fences" symbol="1"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{070da3c0-926e-4be7-b593-17a3235a88fa}" label="Fixed fences" symbol="2"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7be11354-6d79-48d0-a650-aea5f58c1846}" label="Construction" symbol="3"/>
           </rule>
-          <rule label="Is Visible" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" symbol="4"/>
-          <rule checkstate="0" label="Always show" key="{29865286-9e35-459b-929c-beb87e7538de}" symbol="5"/>
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{7917c389-04f8-48d5-ab53-8783abd3803e}" label="Is Visible" symbol="4"/>
+          <rule key="{29865286-9e35-459b-929c-beb87e7538de}" label="Always show" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9026,7 +9012,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}">
+            <layer enabled="1" id="{2a163df5-7eb1-49c2-a7bc-2ed291fcf30f}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="round" name="capstyle" type="QString"/>
@@ -9071,7 +9057,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9079,7 +9065,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67070045-bee5-4271-87d3-86da17eb7dbe}">
+            <layer enabled="1" id="{67070045-bee5-4271-87d3-86da17eb7dbe}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="round" name="capstyle" type="QString"/>
@@ -9124,7 +9110,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9132,7 +9118,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}">
+            <layer enabled="1" id="{5a2b74d4-e468-442b-b3d1-ec5a5a64684d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9177,7 +9163,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9185,7 +9171,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}">
+            <layer enabled="1" id="{63390b08-62bc-49cf-9253-f38f2f5873ba}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9230,7 +9216,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9238,7 +9224,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}">
+            <layer enabled="1" id="{b4f0d3ec-02c4-4087-a954-7b5dbbc193ff}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9277,7 +9263,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="5" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -9285,7 +9271,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}">
+            <layer enabled="1" id="{a7696bb6-29f6-4d1c-9658-f16cd9b080a0}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -9330,12 +9316,12 @@ def my_form_open(dialog, layer, feature):
         <rules key="{b08c8161-de6f-41d9-a933-40d5428d7db9}">
           <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{bc58db75-d3ce-4eaf-8459-5b648cb31e6d}">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="comment" fontWeight="50" legendString="Aa" textOpacity="0.80000000000000004" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="comment" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.59999999999999998" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="1" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderColor="255,255,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.59999999999999998" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="255,255,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9343,7 +9329,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9367,7 +9353,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9388,9 +9374,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="5" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="1" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="5" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="1" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8200000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9421,7 +9407,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3f138265-8207-454a-aea2-d1550143fece}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9435,14 +9421,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Fence lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^fenc')" key="{05f0d95c-3454-4dd1-90b4-cb8e0b996d06}" description="Fence lengths">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9450,7 +9436,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9481,7 +9467,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9489,7 +9475,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9513,7 +9499,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9523,9 +9509,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9561,7 +9547,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{600f705f-00a8-45a0-878d-9e876b280551}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9575,14 +9561,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Cones lengths" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^cone')" key="{64b370d3-e3e2-4e7b-81f6-1372a14c327a}" description="Cones lengths">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9590,7 +9576,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9621,7 +9607,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9629,7 +9615,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9653,7 +9639,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9663,9 +9649,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9701,7 +9687,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{f701d0d7-7c52-4c89-a163-9ddd8ea62c27}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9715,14 +9701,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" key="{ed34792d-3215-42ff-8038-8130a45d3742}" active="0">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9730,7 +9716,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9761,7 +9747,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9769,7 +9755,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9793,7 +9779,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9803,9 +9789,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9841,7 +9827,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -9855,14 +9841,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Always show" filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}">
+          <rule filter="&quot;hidden&quot; IS NULL" key="{faa25ceb-8d2c-4cb2-bacb-dd2fe042fd84}" active="0" description="Always show">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontItalic="0" fontSize="11" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9870,7 +9856,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -9901,7 +9887,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -9909,7 +9895,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -9933,7 +9919,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -9943,9 +9929,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="14" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="6" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="1" layerType="LineGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="1" placementFlags="14" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="6" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -9981,7 +9967,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{accb5992-a30f-4808-9503-917a2ddbd586}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -10014,11 +10000,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -10026,7 +10012,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}">
+              <layer enabled="1" id="{84a50c7c-8587-4323-8cb2-4a7f7eac39b0}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -10068,7 +10054,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10077,77 +10063,77 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -10156,16 +10142,16 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="group"/>
-        <alias index="2" name="" field="comment"/>
-        <alias index="3" name="" field="moveable"/>
-        <alias index="4" name="" field="type"/>
-        <alias index="5" name="" field="name"/>
-        <alias index="6" name="" field="hidden"/>
-        <alias index="7" name="" field="day"/>
-        <alias index="8" name="" field="fence_len"/>
-        <alias index="9" name="" field="cone_len"/>
+        <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"/>
@@ -10180,62 +10166,62 @@ def my_form_open(dialog, layer, feature):
         <policy field="cone_len" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="group"/>
-        <default applyOnUpdate="0" expression="" field="comment"/>
-        <default applyOnUpdate="0" expression="" field="moveable"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="hidden"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="fence_len"/>
-        <default applyOnUpdate="0" expression="" field="cone_len"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="group"/>
+        <default expression="" applyOnUpdate="0" field="comment"/>
+        <default expression="" applyOnUpdate="0" field="moveable"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="hidden"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="fence_len"/>
+        <default expression="" applyOnUpdate="0" field="cone_len"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="group" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="comment" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="moveable" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="hidden" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="fence_len" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="cone_len" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="group" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="comment" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="moveable" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="hidden" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="fence_len" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="cone_len" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="group" exp=""/>
-        <constraint desc="" field="comment" exp=""/>
-        <constraint desc="" field="moveable" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="hidden" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="fence_len" exp=""/>
-        <constraint desc="" field="cone_len" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="group"/>
+        <constraint desc="" exp="" field="comment"/>
+        <constraint desc="" exp="" field="moveable"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="hidden"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="fence_len"/>
+        <constraint desc="" exp="" field="cone_len"/>
       </constraintExpressions>
       <expressionfields>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="fence_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" subType="0" length="-1"/>
-        <field precision="0" typeName="double precision" name="cone_len" type="6" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" subType="0" length="-1"/>
+        <field expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="fence_len" type="6"/>
+        <field expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" precision="0" length="-1" subType="0" comment="" typeName="double precision" name="cone_len" type="6"/>
       </expressionfields>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column name="id" width="31" type="field" hidden="0"/>
-          <column name="group" width="52" type="field" hidden="0"/>
+          <column width="31" name="id" type="field" hidden="0"/>
+          <column width="52" name="group" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="comment" width="85" type="field" hidden="0"/>
-          <column name="moveable" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="name" width="340" type="field" hidden="0"/>
-          <column name="hidden" width="54" type="field" hidden="0"/>
-          <column name="fence_len" width="74" type="field" hidden="0"/>
-          <column name="day" width="40" type="field" hidden="0"/>
-          <column name="cone_len" width="65" type="field" hidden="0"/>
+          <column width="85" name="comment" type="field" hidden="0"/>
+          <column width="-1" name="moveable" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="340" name="name" type="field" hidden="0"/>
+          <column width="54" name="hidden" type="field" hidden="0"/>
+          <column width="74" name="fence_len" type="field" hidden="0"/>
+          <column width="40" name="day" type="field" hidden="0"/>
+          <column width="65" name="cone_len" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10297,23 +10283,23 @@ def my_form_open(dialog, layer, feature):
         <field name="type" labelOnTop="0"/>
       </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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -10387,13 +10373,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10402,7 +10388,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10410,7 +10396,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}">
+            <layer enabled="1" id="{aa8399dc-5c7d-4a12-953b-a35d3f201c1c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -10451,7 +10437,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10459,7 +10445,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}">
+            <layer enabled="1" id="{f7d74011-3fc9-4623-a8c0-4fca9ae5061e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -10484,7 +10470,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10492,7 +10478,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}">
+            <layer enabled="1" id="{16e5fb6a-1cb0-4ca1-acaa-1b2ed7784f24}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -10525,9 +10511,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10535,7 +10521,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c73fab62-3b89-497c-a33c-6825e949a9db}">
+            <layer enabled="1" id="{c73fab62-3b89-497c-a33c-6825e949a9db}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -10593,11 +10579,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -10605,7 +10591,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}">
+              <layer enabled="1" id="{63e50604-3ec9-4690-90f6-75d7e43f5eaf}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -10647,7 +10633,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10656,14 +10642,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option/>
@@ -10672,27 +10658,27 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
+        <alias name="" index="0" field="id"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
+        <constraint desc="" exp="" field="id"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -10736,7 +10722,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
@@ -10810,13 +10796,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -10825,7 +10811,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10833,7 +10819,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}">
+            <layer enabled="1" id="{9990d4cc-bcb3-41c5-8170-fc80ad2adc84}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -10874,7 +10860,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10882,7 +10868,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}">
+            <layer enabled="1" id="{f4c1d28c-3c57-4522-9c5e-d530066f24b3}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -10907,7 +10893,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10915,7 +10901,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}">
+            <layer enabled="1" id="{cf57a051-b643-427d-bb3e-3d8860aa79df}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -10948,9 +10934,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -10958,7 +10944,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}">
+            <layer enabled="1" id="{c6212fc8-dea2-4bee-9589-568ce1be9e7b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -11011,11 +10997,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -11023,7 +11009,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}">
+              <layer enabled="1" id="{2921eca4-d020-4a7b-8a41-a3591daf2eb8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -11065,7 +11051,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -11080,14 +11066,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -11097,7 +11083,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -11107,7 +11093,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="page">
+        <field name="page" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -11117,7 +11103,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="day">
+        <field name="day" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -11126,10 +11112,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="page"/>
-        <alias index="3" name="" field="day"/>
+        <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"/>
@@ -11138,34 +11124,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="page"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="page"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="page" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="page" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="page" exp=""/>
-        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="page"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="page" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="page" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11212,7 +11198,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -11278,7 +11264,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11289,7 +11275,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join targetFieldName="position" joinFieldName="position" cascadedDelete="0" hasCustomPrefix="1" customPrefix="csv_" editable="1" memoryCache="0" joinLayerId="marshals_by_position20161003112326575" dynamicForm="0" upsertOnEdit="1">
+        <join memoryCache="0" joinLayerId="marshals_by_position20161003112326575" joinFieldName="position" hasCustomPrefix="1" cascadedDelete="0" targetFieldName="position" upsertOnEdit="1" dynamicForm="0" customPrefix="csv_" editable="1">
           <joinFieldsSubset>
             <field name="day"/>
             <field name="position"/>
@@ -11316,13 +11302,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="id" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="id" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -11331,7 +11317,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11339,7 +11325,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}">
+            <layer enabled="1" id="{44c3350e-7341-440a-99a7-76d72f8be3f3}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -11380,7 +11366,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11388,7 +11374,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}">
+            <layer enabled="1" id="{c8126bbc-b2c6-4f15-a36f-45c788a40ab9}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -11413,7 +11399,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11421,7 +11407,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}">
+            <layer enabled="1" id="{4714d4c7-61b8-4bc1-9e18-c9d37dc0d5b4}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11454,14 +11440,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule description="Show in marshal overview" label="Show by day in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" symbol="0"/>
-          <rule checkstate="0" label="Always show in marshal plan" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" symbol="1"/>
-          <rule checkstate="0" label="Show in marshal maps" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" symbol="2"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" checkstate="0" label="Show by day in marshal plan" description="Show in marshal overview" symbol="0"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" key="{308d81eb-cefa-4627-8afb-3baa8363f863}" checkstate="0" label="Always show in marshal plan" symbol="1"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" label="Show in marshal maps" symbol="2"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11469,7 +11455,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}">
+            <layer enabled="1" id="{7dc8fcb4-ecf9-4ec6-8fa6-1f8e9f90e4fc}" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11500,7 +11486,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.8">
+          <symbol name="1" is_animated="0" type="marker" frame_rate="10" alpha="0.8" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11508,7 +11494,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{984895dc-f666-478a-9853-cf8b1ad766f1}">
+            <layer enabled="1" id="{984895dc-f666-478a-9853-cf8b1ad766f1}" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11539,7 +11525,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="0.01">
+          <symbol name="2" is_animated="0" type="marker" frame_rate="10" alpha="0.01" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -11547,7 +11533,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="1" enabled="1" class="SimpleMarker" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}">
+            <layer enabled="1" id="{03e961e3-7b2f-40f7-af26-f1711ea1305f}" locked="0" pass="1" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -11582,14 +11568,14 @@ 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)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{56651b46-8545-482e-850b-aa88b9a8dff4}" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11597,7 +11583,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -11628,7 +11614,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11636,7 +11622,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -11666,7 +11652,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -11676,9 +11662,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="1" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="2" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -11714,7 +11700,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3374963e-0453-49e2-b213-ce613b65b48e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -11728,14 +11714,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" key="{81949df8-55c4-47f1-8e9c-18861ce8ec76}" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.10000000000000001" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.10000000000000001" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11743,7 +11729,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -11774,7 +11760,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11782,7 +11768,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -11812,7 +11798,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -11822,9 +11808,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="1" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="2" scaleMax="10000000"/>
+              <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="1" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="2" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -11860,7 +11846,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{6859f605-88dc-447c-ace0-cec9aca27862}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -11874,14 +11860,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" key="{fd239986-b557-4314-b05a-d8c40105e0bc}" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.5" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.5" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.5" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.5" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -11889,7 +11875,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -11919,7 +11905,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -11970,9 +11956,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="5" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12038,7 +12024,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{04eba04c-7ad0-42b7-93a3-fc2ee0a9c3f6}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -12052,14 +12038,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{200d8ec1-1e50-425a-b4c7-a691b4d84d2e}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="50" legendString="Aa" textOpacity="0.59999999999999998" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="6" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="6" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.59999999999999998" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.59999999999999998" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12067,7 +12053,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -12098,7 +12084,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12106,7 +12092,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -12136,7 +12122,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -12146,9 +12132,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="8" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="5" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="8" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12214,7 +12200,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{7e155e66-c9be-4485-a2a4-1cc59f0619d4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -12228,14 +12214,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" key="{84d13a6c-d354-4356-be1f-5803dabd2773}" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="position" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="position" fontItalic="0" fontSize="8" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="3" shapeSizeX="0.20000000000000001" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.40000000000000002" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.20000000000000001" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,0,255" shapeOpacity="0.90000000000000002" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="3" shapeRadiiY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeOpacity="0.90000000000000002" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.40000000000000002" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12243,7 +12229,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -12274,7 +12260,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -12282,7 +12268,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -12312,7 +12298,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -12322,9 +12308,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="0" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="0" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="10" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="0" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12390,7 +12376,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{f89ffa51-4e6a-4551-b7f5-2d221648f82a}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -12414,6 +12400,14 @@ def my_form_open(dialog, layer, feature):
           <Option name="dualview/previewExpressions" type="List">
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
           <Option value="0" name="embeddedWidgets/count" type="QString"/>
           <Option value="false" name="labeling/addDirectionSymbol" type="QString"/>
@@ -12559,11 +12553,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -12571,7 +12565,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{444d8fb8-2321-4272-9699-88b713425993}">
+              <layer enabled="1" id="{444d8fb8-2321-4272-9699-88b713425993}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -12613,7 +12607,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -12622,14 +12616,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12639,7 +12633,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="position">
+        <field name="position" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12649,7 +12643,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12659,7 +12653,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="notes">
+        <field name="notes" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -12669,14 +12663,70 @@ def my_form_open(dialog, layer, feature):
             </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="GROUP">
+        <field name="GROUP" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_day" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_position" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_club" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_captain" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_captain_phone" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_race" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_last_runner" configurationFlags="None">
+          <editWidget type="">
+            <config>
+              <Option/>
+            </config>
+          </editWidget>
+        </field>
+        <field name="csv_instructions" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -12685,12 +12735,20 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="type"/>
-        <alias index="3" name="" field="notes"/>
-        <alias index="4" name="" field="day"/>
-        <alias index="5" name="" field="GROUP"/>
+        <alias name="" index="0" field="id"/>
+        <alias name="" index="1" field="position"/>
+        <alias name="" index="2" field="type"/>
+        <alias name="" index="3" field="notes"/>
+        <alias name="" index="4" field="day"/>
+        <alias name="" index="5" field="GROUP"/>
+        <alias name="" index="6" field="csv_day"/>
+        <alias name="" index="7" field="csv_position"/>
+        <alias name="" index="8" field="csv_club"/>
+        <alias name="" index="9" field="csv_captain"/>
+        <alias name="" index="10" field="csv_captain_phone"/>
+        <alias name="" index="11" field="csv_race"/>
+        <alias name="" index="12" field="csv_last_runner"/>
+        <alias name="" index="13" field="csv_instructions"/>
       </aliases>
       <splitPolicies>
         <policy field="id" policy="Duplicate"/>
@@ -12699,44 +12757,84 @@ def my_form_open(dialog, layer, feature):
         <policy field="notes" policy="Duplicate"/>
         <policy field="day" policy="Duplicate"/>
         <policy field="GROUP" policy="Duplicate"/>
+        <policy field="csv_day" policy="Duplicate"/>
+        <policy field="csv_position" policy="Duplicate"/>
+        <policy field="csv_club" policy="Duplicate"/>
+        <policy field="csv_captain" policy="Duplicate"/>
+        <policy field="csv_captain_phone" policy="Duplicate"/>
+        <policy field="csv_race" policy="Duplicate"/>
+        <policy field="csv_last_runner" policy="Duplicate"/>
+        <policy field="csv_instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="notes"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="GROUP"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="notes"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="GROUP"/>
+        <default expression="" applyOnUpdate="0" field="csv_day"/>
+        <default expression="" applyOnUpdate="0" field="csv_position"/>
+        <default expression="" applyOnUpdate="0" field="csv_club"/>
+        <default expression="" applyOnUpdate="0" field="csv_captain"/>
+        <default expression="" applyOnUpdate="0" field="csv_captain_phone"/>
+        <default expression="" applyOnUpdate="0" field="csv_race"/>
+        <default expression="" applyOnUpdate="0" field="csv_last_runner"/>
+        <default expression="" applyOnUpdate="0" field="csv_instructions"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="notes" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="GROUP" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="notes" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="GROUP" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_captain_phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_race" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="csv_instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="position" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="notes" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="GROUP" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="notes"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="GROUP"/>
+        <constraint desc="" exp="" field="csv_day"/>
+        <constraint desc="" exp="" field="csv_position"/>
+        <constraint desc="" exp="" field="csv_club"/>
+        <constraint desc="" exp="" field="csv_captain"/>
+        <constraint desc="" exp="" field="csv_captain_phone"/>
+        <constraint desc="" exp="" field="csv_race"/>
+        <constraint desc="" exp="" field="csv_last_runner"/>
+        <constraint desc="" exp="" field="csv_instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;position&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="notes" width="-1" type="field" hidden="0"/>
-          <column name="GROUP" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="position" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="notes" type="field" hidden="0"/>
+          <column width="-1" name="GROUP" type="field" hidden="0"/>
+          <column width="-1" name="csv_day" type="field" hidden="0"/>
+          <column width="-1" name="csv_position" type="field" hidden="0"/>
+          <column width="-1" name="csv_club" type="field" hidden="0"/>
+          <column width="-1" name="csv_captain" type="field" hidden="0"/>
+          <column width="-1" name="csv_captain_phone" type="field" hidden="0"/>
+          <column width="-1" name="csv_race" type="field" hidden="0"/>
+          <column width="-1" name="csv_last_runner" type="field" hidden="0"/>
+          <column width="-1" name="csv_instructions" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -12862,38 +12960,38 @@ def my_form_open(dialog, layer, feature):
         <field name="xyposition" labelOnTop="0"/>
       </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>
@@ -12943,65 +13041,65 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1">name</mapTip>
     </maplayer>
-    <maplayer readOnly="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" geometry="No geometry" legendPlaceholderImage="" maxScale="100000" type="vector" hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshTime="0" styleCategories="AllStyleCategories" minScale="1e+08" wkbType="NoGeometry">
+    <maplayer autoRefreshEnabled="0" autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" maxScale="100000" legendPlaceholderImage="" refreshOnNotifyMessage="" minScale="1e+08" styleCategories="AllStyleCategories" geometry="No geometry" type="vector" readOnly="0" refreshOnNotifyEnabled="0" 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>
-        <value/>
+        <value></value>
       </keywordList>
       <layername>marshals_by_position</layername>
       <srs>
         <spatialrefsys nativeFormat="Wkt">
-          <wkt/>
-          <proj4/>
+          <wkt></wkt>
+          <proj4></proj4>
           <srsid>0</srsid>
           <srid>0</srid>
-          <authid/>
-          <description/>
-          <projectionacronym/>
-          <ellipsoidacronym/>
+          <authid></authid>
+          <description></description>
+          <projectionacronym></projectionacronym>
+          <ellipsoidacronym></ellipsoidacronym>
           <geographicflag>false</geographicflag>
         </spatialrefsys>
       </srs>
       <resourceMetadata>
-        <identifier/>
-        <parentidentifier/>
-        <language/>
-        <type/>
-        <title/>
-        <abstract/>
+        <identifier></identifier>
+        <parentidentifier></parentidentifier>
+        <language></language>
+        <type></type>
+        <title></title>
+        <abstract></abstract>
         <contact>
-          <name/>
-          <organization/>
-          <position/>
-          <voice/>
-          <fax/>
-          <email/>
-          <role/>
+          <name></name>
+          <organization></organization>
+          <position></position>
+          <voice></voice>
+          <fax></fax>
+          <email></email>
+          <role></role>
         </contact>
         <links/>
         <dates/>
-        <fees/>
-        <encoding/>
+        <fees></fees>
+        <encoding></encoding>
         <crs>
           <spatialrefsys nativeFormat="Wkt">
-            <wkt/>
-            <proj4/>
+            <wkt></wkt>
+            <proj4></proj4>
             <srsid>0</srsid>
             <srid>0</srid>
-            <authid/>
-            <description/>
-            <projectionacronym/>
-            <ellipsoidacronym/>
+            <authid></authid>
+            <description></description>
+            <projectionacronym></projectionacronym>
+            <ellipsoidacronym></ellipsoidacronym>
             <geographicflag>true</geographicflag>
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
-              <start/>
-              <end/>
+              <start></start>
+              <end></end>
             </period>
           </temporal>
         </extent>
@@ -13022,13 +13120,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
-          <start/>
-          <end/>
+          <start></start>
+          <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" type="IndividualFeatures" zoffset="0" extrusion="0" clamping="Terrain" binding="Centroid" extrusionEnabled="0" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -13037,7 +13135,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13045,7 +13143,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}">
+            <layer enabled="1" id="{17777bf7-f3bb-4ae3-ba7b-6734b1d74abc}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -13086,7 +13184,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13094,7 +13192,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}">
+            <layer enabled="1" id="{f7cbe90e-81f3-4edf-b640-21ece3434af1}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -13119,7 +13217,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13127,7 +13225,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}">
+            <layer enabled="1" id="{2e75a471-0eec-4801-8821-18a2e0a21c45}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -13173,21 +13271,21 @@ def my_form_open(dialog, layer, feature):
           <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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">
@@ -13197,21 +13295,21 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -13221,21 +13319,21 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -13245,35 +13343,35 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -13282,19 +13380,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="day"/>
-        <alias index="1" name="" field="position"/>
-        <alias index="2" name="" field="first_name"/>
-        <alias index="3" name="" field="surname"/>
-        <alias index="4" name="" field="club"/>
-        <alias index="5" name="" field="phone"/>
-        <alias index="6" name="" field="email"/>
-        <alias index="7" name="" field="captain"/>
-        <alias index="8" name="" field="captain_phone"/>
-        <alias index="9" name="" field="race"/>
-        <alias index="10" name="" field="first_runner"/>
-        <alias index="11" name="" field="last_runner"/>
-        <alias index="12" name="" field="instructions"/>
+        <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"/>
@@ -13312,70 +13410,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="instructions" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="position"/>
-        <default applyOnUpdate="0" expression="" field="first_name"/>
-        <default applyOnUpdate="0" expression="" field="surname"/>
-        <default applyOnUpdate="0" expression="" field="club"/>
-        <default applyOnUpdate="0" expression="" field="phone"/>
-        <default applyOnUpdate="0" expression="" field="email"/>
-        <default applyOnUpdate="0" expression="" field="captain"/>
-        <default applyOnUpdate="0" expression="" field="captain_phone"/>
-        <default applyOnUpdate="0" expression="" field="race"/>
-        <default applyOnUpdate="0" expression="" field="first_runner"/>
-        <default applyOnUpdate="0" expression="" field="last_runner"/>
-        <default applyOnUpdate="0" expression="" field="instructions"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="position"/>
+        <default expression="" applyOnUpdate="0" field="first_name"/>
+        <default expression="" applyOnUpdate="0" field="surname"/>
+        <default expression="" applyOnUpdate="0" field="club"/>
+        <default expression="" applyOnUpdate="0" field="phone"/>
+        <default expression="" applyOnUpdate="0" field="email"/>
+        <default expression="" applyOnUpdate="0" field="captain"/>
+        <default expression="" applyOnUpdate="0" field="captain_phone"/>
+        <default expression="" applyOnUpdate="0" field="race"/>
+        <default expression="" applyOnUpdate="0" field="first_runner"/>
+        <default expression="" applyOnUpdate="0" field="last_runner"/>
+        <default expression="" applyOnUpdate="0" field="instructions"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="position" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="surname" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="club" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="phone" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="email" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="captain_phone" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="race" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runner" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runner" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="instructions" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="position" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="surname" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="club" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="email" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="captain_phone" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="race" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_runner" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="instructions" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="position" exp=""/>
-        <constraint desc="" field="first_name" exp=""/>
-        <constraint desc="" field="surname" exp=""/>
-        <constraint desc="" field="club" exp=""/>
-        <constraint desc="" field="phone" exp=""/>
-        <constraint desc="" field="email" exp=""/>
-        <constraint desc="" field="captain" exp=""/>
-        <constraint desc="" field="captain_phone" exp=""/>
-        <constraint desc="" field="race" exp=""/>
-        <constraint desc="" field="first_runner" exp=""/>
-        <constraint desc="" field="last_runner" exp=""/>
-        <constraint desc="" field="instructions" exp=""/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="position"/>
+        <constraint desc="" exp="" field="first_name"/>
+        <constraint desc="" exp="" field="surname"/>
+        <constraint desc="" exp="" field="club"/>
+        <constraint desc="" exp="" field="phone"/>
+        <constraint desc="" exp="" field="email"/>
+        <constraint desc="" exp="" field="captain"/>
+        <constraint desc="" exp="" field="captain_phone"/>
+        <constraint desc="" exp="" field="race"/>
+        <constraint desc="" exp="" field="first_runner"/>
+        <constraint desc="" exp="" field="last_runner"/>
+        <constraint desc="" exp="" field="instructions"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="position" width="-1" type="field" hidden="0"/>
-          <column name="club" width="-1" type="field" hidden="0"/>
-          <column name="phone" width="-1" type="field" hidden="0"/>
-          <column name="email" width="-1" type="field" hidden="0"/>
-          <column name="captain" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="position" type="field" hidden="0"/>
+          <column width="-1" name="club" type="field" hidden="0"/>
+          <column width="-1" name="phone" type="field" hidden="0"/>
+          <column width="-1" name="email" type="field" hidden="0"/>
+          <column width="-1" name="captain" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="first_runner" width="-1" type="field" hidden="0"/>
-          <column name="last_runner" width="-1" type="field" hidden="0"/>
-          <column name="instructions" width="-1" type="field" hidden="0"/>
-          <column name="surname" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="first_name" width="-1" type="field" hidden="0"/>
-          <column name="race" width="-1" type="field" hidden="0"/>
-          <column name="captain_phone" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="first_runner" type="field" hidden="0"/>
+          <column width="-1" name="last_runner" type="field" hidden="0"/>
+          <column width="-1" name="instructions" type="field" hidden="0"/>
+          <column width="-1" name="surname" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="first_name" type="field" hidden="0"/>
+          <column width="-1" name="race" type="field" hidden="0"/>
+          <column width="-1" name="captain_phone" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13455,28 +13553,28 @@ def my_form_open(dialog, layer, feature):
         <field name="tshirt" labelOnTop="0"/>
       </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"/>
+      <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -13542,7 +13640,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -13567,13 +13665,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -13582,7 +13680,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13590,7 +13688,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}">
+            <layer enabled="1" id="{ec66ea25-3a2c-4d78-81a9-e30a37622f7a}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -13631,7 +13729,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13639,7 +13737,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}">
+            <layer enabled="1" id="{5970f832-e8d3-481a-8cf9-9744ea98d012}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -13664,7 +13762,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13672,7 +13770,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}">
+            <layer enabled="1" id="{8d4290c3-b722-4503-bba9-f0f83dceef08}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -13705,13 +13803,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13719,7 +13817,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{743d2826-031c-45d5-809e-09f032abdd16}">
+            <layer enabled="1" id="{743d2826-031c-45d5-809e-09f032abdd16}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -13758,7 +13856,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -13766,7 +13864,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}">
+            <layer enabled="1" id="{67e8e58f-ebb8-4d6f-98e4-0fe478971e4d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -13804,7 +13902,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}">
+            <layer enabled="1" id="{5bc5cab5-5ee5-44d4-a041-c8578229856e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -13830,7 +13928,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -13838,7 +13936,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}">
+                <layer enabled="1" id="{3d08edd6-0c5d-40f5-af8a-319664fb99b2}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -13860,7 +13958,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -13868,7 +13966,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{03389801-e1b4-43c1-bed5-409ab2a31647}">
+                    <layer enabled="1" id="{03389801-e1b4-43c1-bed5-409ab2a31647}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -13912,11 +14010,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -13924,7 +14022,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}">
+              <layer enabled="1" id="{6d442ef8-203c-4e8d-a152-dd5df04ffb7f}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -13966,7 +14064,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -13975,21 +14073,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -13998,34 +14096,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14070,7 +14168,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -14136,7 +14234,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14161,13 +14259,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -14176,7 +14274,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14184,7 +14282,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}">
+            <layer enabled="1" id="{a105f351-5300-4f5a-b18e-bf12befaf2bf}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -14225,7 +14323,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14233,7 +14331,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}">
+            <layer enabled="1" id="{6dbac73e-d32a-4cf1-b4ad-8be06e7cd206}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -14258,7 +14356,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14266,7 +14364,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}">
+            <layer enabled="1" id="{df628654-d9be-4ed6-a58f-7f0a1d0bc6d9}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -14299,15 +14397,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="name" fontWeight="50" legendString="Aa" textOpacity="0.75" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8.5" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="8.5" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.75" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1.5" bufferDraw="1" bufferNoFill="0"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1.5" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -14315,7 +14413,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -14339,7 +14437,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14370,9 +14468,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="2" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="1" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="0" dist="0" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+          <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="2" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="1" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.20000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -14413,7 +14511,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{de9554be-2456-444d-a857-fe7f81f1c490}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -14442,11 +14540,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -14454,7 +14552,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}">
+              <layer enabled="1" id="{0e471f35-a1c6-4f66-806a-ebf1c802d8a8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -14496,7 +14594,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -14505,14 +14603,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14522,7 +14620,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14532,7 +14630,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14542,7 +14640,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="type">
+        <field name="type" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14552,7 +14650,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="z_order">
+        <field name="z_order" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14562,7 +14660,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="population">
+        <field name="population" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14572,7 +14670,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_x">
+        <field name="label_x" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14582,7 +14680,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_y">
+        <field name="label_y" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14592,7 +14690,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label_rota">
+        <field name="label_rota" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -14604,15 +14702,15 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="osm_id"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="type"/>
-        <alias index="4" name="" field="z_order"/>
-        <alias index="5" name="" field="population"/>
-        <alias index="6" name="" field="label_x"/>
-        <alias index="7" name="" field="label_y"/>
-        <alias index="8" name="" field="label_rota"/>
+        <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"/>
@@ -14626,54 +14724,54 @@ def my_form_open(dialog, layer, feature):
         <policy field="label_rota" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="population"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="population"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="population" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="population" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="osm_id" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="z_order" exp=""/>
-        <constraint desc="" field="population" exp=""/>
-        <constraint desc="" field="label_x" exp=""/>
-        <constraint desc="" field="label_y" exp=""/>
-        <constraint desc="" field="label_rota" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="population"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
-          <column name="population" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="osm_id" type="field" hidden="0"/>
+          <column width="-1" name="name" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
+          <column width="-1" name="z_order" type="field" hidden="0"/>
+          <column width="-1" name="population" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="label_x" type="field" hidden="0"/>
+          <column width="-1" name="label_y" type="field" hidden="0"/>
+          <column width="-1" name="label_rota" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14732,7 +14830,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -14798,7 +14896,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14823,13 +14921,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -14838,7 +14936,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14846,7 +14944,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}">
+            <layer enabled="1" id="{d6d99d5e-d424-42a2-a0a9-bc575b23dcfe}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -14887,7 +14985,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14895,7 +14993,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}">
+            <layer enabled="1" id="{dfa1c0d1-8969-484b-98c8-4f5e15c75a81}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -14920,7 +15018,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -14928,7 +15026,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{354d4d11-8126-426c-b325-0776a64e32e3}">
+            <layer enabled="1" id="{354d4d11-8126-426c-b325-0776a64e32e3}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -14961,15 +15059,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" legendString="Aa" textOpacity="0.80000000000000004" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="7" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontItalic="0" fontSize="7" textColor="0,0,0,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.80000000000000004" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="0"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.59999999999999998" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -14977,7 +15075,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -15008,7 +15106,7 @@ def my_form_open(dialog, layer, feature):
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -15016,7 +15114,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -15040,7 +15138,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15050,9 +15148,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="0" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="4" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="3" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="0" dist="0" layerType="LineGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="3" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MapUnit" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="1" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="5" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+          <text-format multilineAlign="0" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MapUnit" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="LineGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="3" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="0" placementFlags="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="3" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="5" obstacle="1" mergeLines="1" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.29999999999999999" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -15113,7 +15211,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{890359d3-19fa-4681-a808-5935abf39fe5}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -15144,11 +15242,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Arial,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -15156,7 +15254,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}">
+              <layer enabled="1" id="{4894d38f-ec01-441d-8ea2-96bca2b0e946}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -15198,7 +15296,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -15207,14 +15305,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="osm_id">
+        <field name="osm_id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -15224,7 +15322,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="name">
+        <field name="name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -15234,42 +15332,42 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -15279,56 +15377,56 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -15337,22 +15435,22 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="osm_id"/>
-        <alias index="1" name="" field="name"/>
-        <alias index="2" name="" field="highway"/>
-        <alias index="3" name="" field="waterway"/>
-        <alias index="4" name="" field="aerialway"/>
-        <alias index="5" name="" field="barrier"/>
-        <alias index="6" name="" field="man_made"/>
-        <alias index="7" name="" field="z_order"/>
-        <alias index="8" name="" field="other_tags"/>
-        <alias index="9" name="" field="never_show"/>
-        <alias index="10" name="" field="label_x"/>
-        <alias index="11" name="" field="label_y"/>
-        <alias index="12" name="" field="label_rota"/>
-        <alias index="13" name="" field="always_sho"/>
-        <alias index="14" name="" field="resident_a"/>
-        <alias index="15" name="" field="auxiliary_storage_labeling_show"/>
+        <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"/>
@@ -15373,82 +15471,82 @@ def my_form_open(dialog, layer, feature):
         <policy field="auxiliary_storage_labeling_show" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="osm_id"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="highway"/>
-        <default applyOnUpdate="0" expression="" field="waterway"/>
-        <default applyOnUpdate="0" expression="" field="aerialway"/>
-        <default applyOnUpdate="0" expression="" field="barrier"/>
-        <default applyOnUpdate="0" expression="" field="man_made"/>
-        <default applyOnUpdate="0" expression="" field="z_order"/>
-        <default applyOnUpdate="0" expression="" field="other_tags"/>
-        <default applyOnUpdate="0" expression="" field="never_show"/>
-        <default applyOnUpdate="0" expression="" field="label_x"/>
-        <default applyOnUpdate="0" expression="" field="label_y"/>
-        <default applyOnUpdate="0" expression="" field="label_rota"/>
-        <default applyOnUpdate="0" expression="" field="always_sho"/>
-        <default applyOnUpdate="0" expression="" field="resident_a"/>
-        <default applyOnUpdate="0" expression="" field="auxiliary_storage_labeling_show"/>
+        <default expression="" applyOnUpdate="0" field="osm_id"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="highway"/>
+        <default expression="" applyOnUpdate="0" field="waterway"/>
+        <default expression="" applyOnUpdate="0" field="aerialway"/>
+        <default expression="" applyOnUpdate="0" field="barrier"/>
+        <default expression="" applyOnUpdate="0" field="man_made"/>
+        <default expression="" applyOnUpdate="0" field="z_order"/>
+        <default expression="" applyOnUpdate="0" field="other_tags"/>
+        <default expression="" applyOnUpdate="0" field="never_show"/>
+        <default expression="" applyOnUpdate="0" field="label_x"/>
+        <default expression="" applyOnUpdate="0" field="label_y"/>
+        <default expression="" applyOnUpdate="0" field="label_rota"/>
+        <default expression="" applyOnUpdate="0" field="always_sho"/>
+        <default expression="" applyOnUpdate="0" field="resident_a"/>
+        <default expression="" applyOnUpdate="0" field="auxiliary_storage_labeling_show"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="osm_id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="highway" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="waterway" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="aerialway" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="barrier" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="man_made" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="z_order" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="other_tags" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="never_show" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_x" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_y" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label_rota" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="always_sho" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="resident_a" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="auxiliary_storage_labeling_show" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="osm_id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="highway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="waterway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="aerialway" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="barrier" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="man_made" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="z_order" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="other_tags" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="never_show" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_x" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_y" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label_rota" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="always_sho" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="resident_a" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="auxiliary_storage_labeling_show" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="osm_id" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="highway" exp=""/>
-        <constraint desc="" field="waterway" exp=""/>
-        <constraint desc="" field="aerialway" exp=""/>
-        <constraint desc="" field="barrier" exp=""/>
-        <constraint desc="" field="man_made" exp=""/>
-        <constraint desc="" field="z_order" exp=""/>
-        <constraint desc="" field="other_tags" exp=""/>
-        <constraint desc="" field="never_show" exp=""/>
-        <constraint desc="" field="label_x" exp=""/>
-        <constraint desc="" field="label_y" exp=""/>
-        <constraint desc="" field="label_rota" exp=""/>
-        <constraint desc="" field="always_sho" exp=""/>
-        <constraint desc="" field="resident_a" exp=""/>
-        <constraint desc="" field="auxiliary_storage_labeling_show" exp=""/>
+        <constraint desc="" exp="" field="osm_id"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="highway"/>
+        <constraint desc="" exp="" field="waterway"/>
+        <constraint desc="" exp="" field="aerialway"/>
+        <constraint desc="" exp="" field="barrier"/>
+        <constraint desc="" exp="" field="man_made"/>
+        <constraint desc="" exp="" field="z_order"/>
+        <constraint desc="" exp="" field="other_tags"/>
+        <constraint desc="" exp="" field="never_show"/>
+        <constraint desc="" exp="" field="label_x"/>
+        <constraint desc="" exp="" field="label_y"/>
+        <constraint desc="" exp="" field="label_rota"/>
+        <constraint desc="" exp="" field="always_sho"/>
+        <constraint desc="" exp="" field="resident_a"/>
+        <constraint desc="" exp="" field="auxiliary_storage_labeling_show"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;osm_id&quot;">
         <columns>
-          <column name="osm_id" width="-1" type="field" hidden="0"/>
-          <column name="name" width="160" type="field" hidden="0"/>
-          <column name="z_order" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="osm_id" type="field" hidden="0"/>
+          <column width="160" name="name" type="field" hidden="0"/>
+          <column width="-1" name="z_order" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="highway" width="-1" type="field" hidden="0"/>
-          <column name="waterway" width="-1" type="field" hidden="0"/>
-          <column name="aerialway" width="-1" type="field" hidden="0"/>
-          <column name="barrier" width="-1" type="field" hidden="0"/>
-          <column name="man_made" width="-1" type="field" hidden="0"/>
-          <column name="other_tags" width="175" type="field" hidden="0"/>
-          <column name="never_show" width="-1" type="field" hidden="0"/>
-          <column name="label_x" width="-1" type="field" hidden="0"/>
-          <column name="label_y" width="-1" type="field" hidden="0"/>
-          <column name="label_rota" width="-1" type="field" hidden="0"/>
-          <column name="always_sho" width="-1" type="field" hidden="0"/>
-          <column name="resident_a" width="-1" type="field" hidden="0"/>
-          <column name="auxiliary_storage_labeling_show" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="highway" type="field" hidden="0"/>
+          <column width="-1" name="waterway" type="field" hidden="0"/>
+          <column width="-1" name="aerialway" type="field" hidden="0"/>
+          <column width="-1" name="barrier" type="field" hidden="0"/>
+          <column width="-1" name="man_made" type="field" hidden="0"/>
+          <column width="175" name="other_tags" type="field" hidden="0"/>
+          <column width="-1" name="never_show" type="field" hidden="0"/>
+          <column width="-1" name="label_x" type="field" hidden="0"/>
+          <column width="-1" name="label_y" type="field" hidden="0"/>
+          <column width="-1" name="label_rota" type="field" hidden="0"/>
+          <column width="-1" name="always_sho" type="field" hidden="0"/>
+          <column width="-1" name="resident_a" type="field" hidden="0"/>
+          <column width="-1" name="auxiliary_storage_labeling_show" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -15552,22 +15650,22 @@ def my_form_open(dialog, layer, feature):
         <field name="z_order" labelOnTop="0"/>
       </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>
@@ -15617,7 +15715,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -15683,7 +15781,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -15708,13 +15806,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -15723,7 +15821,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15731,7 +15829,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}">
+            <layer enabled="1" id="{1f77984f-5aa8-4f85-a8f6-3372683c0724}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -15772,7 +15870,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15780,7 +15878,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}">
+            <layer enabled="1" id="{d96e5781-f5bf-48f8-b4e0-2fee393589e8}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -15805,7 +15903,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15813,7 +15911,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}">
+            <layer enabled="1" id="{1c5aec7e-4c77-4262-a06c-203b26daec78}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -15846,7 +15944,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
           <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" key="{efda7615-994b-459d-a657-ee8185286b0b}" symbol="0"/>
           <rule filter="&quot;type&quot; = 'toilets'" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" symbol="1"/>
@@ -15856,7 +15954,7 @@ def my_form_open(dialog, layer, feature):
           <rule filter="&quot;type&quot; = 'parking'" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" symbol="5"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15864,7 +15962,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}">
+            <layer enabled="1" id="{3546123c-8397-4bc7-a88a-dbadd7ebb3d6}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -15901,7 +15999,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15909,7 +16007,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}">
+            <layer enabled="1" id="{74e7b734-0e1a-432e-bf3d-32d79041a365}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="0,32,80,255" name="color" type="QString"/>
@@ -15945,7 +16043,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -15953,7 +16051,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}">
+            <layer enabled="1" id="{38428a6a-34c4-41de-a5a9-70586b4b9787}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="0,0,0,255" name="color" type="QString"/>
@@ -15999,7 +16097,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16007,7 +16105,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}">
+            <layer enabled="1" id="{858a74db-7e97-4ba3-80a3-95d5b5a1202e}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="125,139,143,255" name="color" type="QString"/>
@@ -16043,7 +16141,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16051,7 +16149,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}">
+            <layer enabled="1" id="{d8eaedc5-787c-4cff-a81b-a2d2cecb2b25}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="0,12,254,255" name="color" type="QString"/>
@@ -16173,7 +16271,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="5" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="5" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16181,7 +16279,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SvgMarker" id="{810b6ab6-d667-41dd-991f-1013e4243a85}">
+            <layer enabled="1" id="{810b6ab6-d667-41dd-991f-1013e4243a85}" locked="0" pass="0" class="SvgMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="43,153,41,255" name="color" type="QString"/>
@@ -16221,12 +16319,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="name" fontWeight="63" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="name" fontItalic="0" fontSize="10" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="0.80000000000000004" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="2" bufferDraw="1" bufferNoFill="0"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="1" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="0.69999999999999996" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="2" shapeRadiiY="2">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.80000000000000004" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="2" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="2" shapeType="0" shapeRadiiY="2" shapeSizeY="1" shapeSizeUnit="MM" shapeOpacity="0.69999999999999996" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -16234,7 +16332,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -16258,7 +16356,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16284,9 +16382,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="2" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="1" dist="3" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="2" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="3" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1.8" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="10" scaleMax="0"/>
+          <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="2" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="2" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="3" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="3"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="10" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1.8" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -16322,7 +16420,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{da91a4fe-393e-4f62-a278-8641d573223e}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -16351,11 +16449,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -16363,7 +16461,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}">
+              <layer enabled="1" id="{96ec7de4-c56e-43b5-b272-81c659d6f103}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -16405,7 +16503,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -16414,35 +16512,35 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -16451,10 +16549,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="name"/>
-        <alias index="3" name="" field="distance"/>
+        <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"/>
@@ -16463,34 +16561,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="name"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="name"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="name" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="name"/>
+        <constraint desc="" exp="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;type&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="name" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="name" type="field" hidden="0"/>
+          <column width="-1" name="distance" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16539,7 +16637,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -16613,13 +16711,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -16628,7 +16726,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16636,7 +16734,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}">
+            <layer enabled="1" id="{fa09f1ab-8c93-4dba-bb49-c1c2788a3078}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -16677,7 +16775,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16685,7 +16783,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{638d4661-4af7-4b67-a441-09cca39661c7}">
+            <layer enabled="1" id="{638d4661-4af7-4b67-a441-09cca39661c7}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -16710,7 +16808,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16718,7 +16816,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}">
+            <layer enabled="1" id="{bad68c93-48cb-4ba1-8fba-f4bd1a05cae6}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -16751,9 +16849,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -16761,7 +16859,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="LinePatternFill" id="{73145fbe-931c-4579-aa0e-58592a465db8}">
+            <layer enabled="1" id="{73145fbe-931c-4579-aa0e-58592a465db8}" locked="0" pass="0" class="LinePatternFill">
               <Option type="Map">
                 <Option value="135" name="angle" type="QString"/>
                 <Option value="during_render" name="clip_mode" type="QString"/>
@@ -16786,7 +16884,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@0@0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+              <symbol name="@0@0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -16794,7 +16892,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}">
+                <layer enabled="1" id="{57fd2d56-c39d-4977-83ca-bde3e7fabf2f}" locked="0" pass="0" class="SimpleLine">
                   <Option type="Map">
                     <Option value="0" name="align_dash_pattern" type="QString"/>
                     <Option value="square" name="capstyle" type="QString"/>
@@ -16834,7 +16932,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}">
+            <layer enabled="1" id="{8a2f6b14-d214-4387-95f5-6e9a60261c54}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -16876,11 +16974,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -16888,7 +16986,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}">
+              <layer enabled="1" id="{415aef82-46a2-4dec-86d6-89f9b40ee054}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -16930,7 +17028,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="1" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="1">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -16939,14 +17037,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="FID">
+        <field name="FID" configurationFlags="None">
           <editWidget type="">
             <config>
               <Option/>
@@ -16955,28 +17053,28 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias name="" index="0" field="FID"/>
       </aliases>
       <splitPolicies>
         <policy field="FID" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="FID"/>
+        <default expression="" applyOnUpdate="0" field="FID"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="FID" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="FID" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="FID" exp=""/>
+        <constraint desc="" exp="" field="FID"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="431" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="431" name="type" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -17022,7 +17120,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -17088,7 +17186,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17113,13 +17211,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -17128,7 +17226,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17136,7 +17234,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}">
+            <layer enabled="1" id="{632aac78-3857-4b6d-b06d-93d59edd5e0d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17177,7 +17275,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17185,7 +17283,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}">
+            <layer enabled="1" id="{aa41f8f2-660a-40d2-ba74-664ae83521de}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -17210,7 +17308,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17218,7 +17316,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}">
+            <layer enabled="1" id="{8f3fc29f-e000-40ac-8f09-e0a85a34982f}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -17251,16 +17349,16 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule label="Road Open" filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" symbol="0"/>
-          <rule label="No Parking" filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" symbol="1"/>
-          <rule label="Lane Closed" filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" symbol="2"/>
-          <rule label="One-Way" filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" symbol="3"/>
-          <rule label="Road Closures" filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" symbol="4"/>
+          <rule filter="&quot;status&quot; = 'open'" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" label="Road Open" symbol="0"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" label="No Parking" symbol="1"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" label="Lane Closed" symbol="2"/>
+          <rule filter="&quot;status&quot; = 'one-way'" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" label="One-Way" symbol="3"/>
+          <rule filter="&quot;status&quot; = 'closure'" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" label="Road Closures" symbol="4"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17268,7 +17366,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}">
+            <layer enabled="1" id="{51a07b29-40c3-4161-af2d-c78ebd13c84a}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17318,7 +17416,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17326,7 +17424,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}">
+            <layer enabled="1" id="{c562c472-ec06-4f26-b22a-f6a1fe2f939e}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -17352,7 +17450,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17360,7 +17458,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8668549c-374e-4077-bc7c-96a9bac646a8}">
+                <layer enabled="1" id="{8668549c-374e-4077-bc7c-96a9bac646a8}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -17393,7 +17491,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="2" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="2" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17401,7 +17499,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}">
+            <layer enabled="1" id="{0f28fdce-ca1e-4e8f-8a58-1b1877a9e826}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17450,7 +17548,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}">
+            <layer enabled="1" id="{ae65dc6e-d043-46e0-aa51-28b2dce68019}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -17482,7 +17580,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@2@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@2@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17490,7 +17588,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e7a97d22-eba0-4c48-9578-db859faf4112}">
+                <layer enabled="1" id="{e7a97d22-eba0-4c48-9578-db859faf4112}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -17529,7 +17627,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="3" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="3" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17537,7 +17635,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{07696f80-e7db-403b-b380-82695a86ae34}">
+            <layer enabled="1" id="{07696f80-e7db-403b-b380-82695a86ae34}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17586,7 +17684,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}">
+            <layer enabled="1" id="{626ffee7-9b80-4e7c-b9e1-23c2f3eaf147}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -17618,7 +17716,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@3@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@3@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17626,7 +17724,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{e24fa060-35e4-4c51-b944-426558636610}">
+                <layer enabled="1" id="{e24fa060-35e4-4c51-b944-426558636610}" locked="0" pass="0" class="SimpleMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="square" name="cap_style" type="QString"/>
@@ -17665,7 +17763,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="4" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="4" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17673,7 +17771,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}">
+            <layer enabled="1" id="{ee4ff26e-ceba-4a76-bfd3-988d9e3c622d}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -17727,12 +17825,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="times" fontWeight="50" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Regular" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Regular" fontWeight="50" blendMode="0" fontWordSpacing="0" fieldName="times" fontItalic="0" fontSize="9" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -17740,7 +17838,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -17764,7 +17862,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -17774,9 +17872,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="0" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="2" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+          <text-format multilineAlign="4294967295" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="2" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -17796,7 +17894,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{83dfc0c6-50a0-4499-a084-3e75da5fa855}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -17825,11 +17923,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -17837,7 +17935,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{27379576-e711-4788-850d-75df56ba927b}">
+              <layer enabled="1" id="{27379576-e711-4788-850d-75df56ba927b}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -17879,7 +17977,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -17888,35 +17986,35 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -17925,10 +18023,10 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
-        <alias index="2" name="" field="status"/>
-        <alias index="3" name="" field="times"/>
+        <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"/>
@@ -17937,34 +18035,34 @@ def my_form_open(dialog, layer, feature):
         <policy field="times" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
-        <default applyOnUpdate="0" expression="" field="status"/>
-        <default applyOnUpdate="0" expression="" field="times"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
+        <default expression="" applyOnUpdate="0" field="status"/>
+        <default expression="" applyOnUpdate="0" field="times"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="status" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="times" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="status" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="times" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
-        <constraint desc="" field="status" exp=""/>
-        <constraint desc="" field="times" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
+        <constraint desc="" exp="" field="status"/>
+        <constraint desc="" exp="" field="times"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;id&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="type" width="202" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="202" name="type" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="status" width="-1" type="field" hidden="0"/>
-          <column name="times" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="status" type="field" hidden="0"/>
+          <column width="-1" name="times" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18013,7 +18111,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37579747691996346</xmin>
         <ymin>-33.95582399193413892</ymin>
@@ -18087,13 +18185,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -18102,7 +18200,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -18110,7 +18208,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
+            <layer enabled="1" id="{93207e61-042d-4541-8790-df2a776e7483}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -18151,7 +18249,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -18159,7 +18257,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
+            <layer enabled="1" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -18184,7 +18282,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -18192,7 +18290,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
+            <layer enabled="1" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -18225,17 +18323,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="rule-based">
         <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
+          <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; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}" description="Active routes">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18243,7 +18341,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -18274,7 +18372,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18282,7 +18380,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -18317,7 +18415,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18327,9 +18425,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -18380,7 +18478,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18394,14 +18492,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}" description="Show by day">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="0,0,0,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="0,0,0,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18409,7 +18507,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -18440,7 +18538,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -18448,7 +18546,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -18483,7 +18581,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18493,9 +18591,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+              <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -18546,7 +18644,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18560,15 +18658,15 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" description="21KM" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}" active="0" description="List for legends">
+            <rule filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}" active="0" description="21KM">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="210,32,39,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="210,32,39,255" shapeOffsetX="0">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18576,7 +18674,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -18600,7 +18698,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -18631,9 +18729,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="3" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18674,7 +18772,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18688,14 +18786,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule active="0" description="10KM" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
+            <rule filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}" active="0" description="10KM">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="128" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="103,34,144,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="103,34,144,255" shapeOffsetX="0">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18703,7 +18801,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -18727,7 +18825,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -18758,9 +18856,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18801,7 +18899,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18815,14 +18913,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule active="0" description="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
+            <rule filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}" active="0" description="5KM">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
+                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18830,7 +18928,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                         <Option type="Map">
                           <Option value="0" name="angle" type="QString"/>
                           <Option value="square" name="cap_style" type="QString"/>
@@ -18861,7 +18959,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18869,7 +18967,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -18893,7 +18991,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -18903,9 +19001,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -18946,7 +19044,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -18960,14 +19058,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
+            <rule filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}" active="0" description="Trail">
               <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+                <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontItalic="0" fontSize="10" textColor="255,255,255,255" isExpression="1" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
                   <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                  <text-buffer bufferJoinStyle="64" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                  <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                  <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="1" shapeType="0" shapeRadiiY="1" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="1" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="145,211,55,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeBorderColor="145,211,55,255" shapeOffsetX="0">
+                    <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -18975,7 +19073,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                         <Option type="Map">
                           <Option value="0" name="angle" type="QString"/>
                           <Option value="square" name="cap_style" type="QString"/>
@@ -19006,7 +19104,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                    <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option value="" name="name" type="QString"/>
@@ -19014,7 +19112,7 @@ def my_form_open(dialog, layer, feature):
                           <Option value="collection" name="type" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                      <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                         <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"/>
@@ -19038,7 +19136,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                  <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -19048,9 +19146,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
+                <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+                <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="1" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PointGeometry" maxCurvedCharAngleOut="-20" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="6" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="AllowOverlapIfRequired" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="20" dist="2" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="10" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+                <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="2" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -19091,7 +19189,7 @@ def my_form_open(dialog, layer, feature):
                     <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -19125,11 +19223,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -19137,7 +19235,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
+              <layer enabled="1" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -19179,7 +19277,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -19188,14 +19286,14 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
+        <field name="Name" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19205,7 +19303,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="begin">
+        <field name="begin" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19215,7 +19313,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="end">
+        <field name="end" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19225,7 +19323,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="Distance">
+        <field name="Distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19235,7 +19333,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="RouteLen">
+        <field name="RouteLen" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19245,21 +19343,21 @@ def my_form_open(dialog, layer, feature):
             </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="Source">
+        <field name="Source" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19269,7 +19367,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_km">
+        <field name="length_km" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19279,7 +19377,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="length_m">
+        <field name="length_m" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19289,7 +19387,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="org_fid">
+        <field name="org_fid" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19299,7 +19397,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="distance">
+        <field name="distance" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -19311,18 +19409,18 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="begin"/>
-        <alias index="2" name="" field="end"/>
-        <alias index="3" name="" field="Distance"/>
-        <alias index="4" name="" field="RouteLen"/>
-        <alias index="5" name="" field="Sort"/>
-        <alias index="6" name="" field="day"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="length_m"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
+        <alias name="" index="0" field="Name"/>
+        <alias name="" index="1" field="begin"/>
+        <alias name="" index="2" field="end"/>
+        <alias name="" index="3" field="Distance"/>
+        <alias name="" index="4" field="RouteLen"/>
+        <alias name="" index="5" field="Sort"/>
+        <alias name="" index="6" field="day"/>
+        <alias name="" index="7" field="Source"/>
+        <alias name="" index="8" field="length_km"/>
+        <alias name="" index="9" field="length_m"/>
+        <alias name="" index="10" field="org_fid"/>
+        <alias name="" index="11" field="distance"/>
       </aliases>
       <splitPolicies>
         <policy field="Name" policy="Duplicate"/>
@@ -19339,66 +19437,66 @@ def my_form_open(dialog, layer, feature):
         <policy field="distance" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <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="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <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 expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="Distance"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Sort"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Sort" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="Distance"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Sort"/>
+        <constraint desc="" exp="" field="day"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;Source&quot;">
         <columns>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="org_fid" type="field" hidden="0"/>
+          <column width="-1" name="distance" type="field" hidden="0"/>
+          <column width="-1" name="Name" type="field" hidden="0"/>
+          <column width="-1" name="Source" type="field" hidden="0"/>
+          <column width="-1" name="RouteLen" type="field" hidden="0"/>
+          <column width="-1" name="begin" type="field" hidden="0"/>
+          <column width="-1" name="end" type="field" hidden="0"/>
+          <column width="-1" name="Distance" type="field" hidden="0"/>
+          <column width="-1" name="length_km" type="field" hidden="0"/>
+          <column width="-1" name="Sort" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="-1" name="length_m" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19464,1515 +19562,28 @@ def my_form_open(dialog, layer, feature):
         <field name="timestamp" labelOnTop="0"/>
       </labelOnTop>
       <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
+        <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 simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="100000" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
-      <extent>
-        <xmin>18.37568387427754857</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.9003177544488068</ymax>
-      </extent>
-      <wgs84extent>
-        <xmin>18.37568387427754857</xmin>
-        <ymin>-33.95582399193413892</ymin>
-        <xmax>18.42274888203563066</xmax>
-        <ymax>-33.9003177544488068</ymax>
-      </wgs84extent>
-      <id>route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549</id>
-      <datasource>memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(8,0)</datasource>
-      <keywordList>
-        <value></value>
-      </keywordList>
-      <layername>route_markers</layername>
-      <srs>
-        <spatialrefsys nativeFormat="Wkt">
-          <wkt>GEOGCRS["WGS 84",ENSEMBLE["World Geodetic System 1984 ensemble",MEMBER["World Geodetic System 1984 (Transit)"],MEMBER["World Geodetic System 1984 (G730)"],MEMBER["World Geodetic System 1984 (G873)"],MEMBER["World Geodetic System 1984 (G1150)"],MEMBER["World Geodetic System 1984 (G1674)"],MEMBER["World Geodetic System 1984 (G1762)"],MEMBER["World Geodetic System 1984 (G2139)"],ELLIPSOID["WGS 84",6378137,298.257223563,LENGTHUNIT["metre",1]],ENSEMBLEACCURACY[2.0]],PRIMEM["Greenwich",0,ANGLEUNIT["degree",0.0174532925199433]],CS[ellipsoidal,2],AXIS["geodetic latitude (Lat)",north,ORDER[1],ANGLEUNIT["degree",0.0174532925199433]],AXIS["geodetic longitude (Lon)",east,ORDER[2],ANGLEUNIT["degree",0.0174532925199433]],USAGE[SCOPE["Horizontal component of 3D system."],AREA["World."],BBOX[-90,-180,90,180]],ID["EPSG",4326]]</wkt>
-          <proj4>+proj=longlat +datum=WGS84 +no_defs</proj4>
-          <srsid>3452</srsid>
-          <srid>4326</srid>
-          <authid>EPSG:4326</authid>
-          <description>WGS 84</description>
-          <projectionacronym>longlat</projectionacronym>
-          <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
-          <geographicflag>true</geographicflag>
-        </spatialrefsys>
-      </srs>
-      <resourceMetadata>
-        <identifier></identifier>
-        <parentidentifier></parentidentifier>
-        <language></language>
-        <type></type>
-        <title></title>
-        <abstract></abstract>
-        <links/>
-        <dates/>
-        <fees></fees>
-        <encoding></encoding>
-        <crs>
-          <spatialrefsys nativeFormat="Wkt">
-            <wkt></wkt>
-            <proj4></proj4>
-            <srsid>0</srsid>
-            <srid>0</srid>
-            <authid></authid>
-            <description></description>
-            <projectionacronym></projectionacronym>
-            <ellipsoidacronym></ellipsoidacronym>
-            <geographicflag>false</geographicflag>
-          </spatialrefsys>
-        </crs>
-        <extent/>
-      </resourceMetadata>
-      <provider encoding="">memory</provider>
-      <vectorjoins/>
-      <layerDependencies/>
-      <dataDependencies/>
-      <expressionfields/>
-      <map-layer-style-manager current="default">
-        <map-layer-style name="default"/>
-      </map-layer-style-manager>
-      <auxiliaryLayer/>
-      <metadataUrls/>
-      <flags>
-        <Identifiable>1</Identifiable>
-        <Removable>1</Removable>
-        <Searchable>1</Searchable>
-        <Private>0</Private>
-      </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
-        <fixedRange>
-          <start></start>
-          <end></end>
-        </fixedRange>
-      </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
-        <data-defined-properties>
-          <Option type="Map">
-            <Option value="" name="name" type="QString"/>
-            <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
-          </Option>
-        </data-defined-properties>
-        <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{93207e61-042d-4541-8790-df2a776e7483}">
-              <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>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileLineSymbol>
-        <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ea18b35c-a49a-4ee5-b455-9b9fc4e0142a}">
-              <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>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileFillSymbol>
-        <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-            <data_defined_properties>
-              <Option type="Map">
-                <Option value="" name="name" type="QString"/>
-                <Option name="properties"/>
-                <Option value="collection" name="type" type="QString"/>
-              </Option>
-            </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7115cd2a-b3eb-4bdb-b88a-0c7d10fced8a}">
-              <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>
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-            </layer>
-          </symbol>
-        </profileMarkerSymbol>
-      </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
-      <labeling type="rule-based">
-        <rules key="{0a21d493-4660-4ca1-93f7-576853cb2747}">
-          <rule description="Active routes" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{1841247a-0aa9-4bad-a3cb-912a4b1d2221}">
-            <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <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>
-                            <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>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </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="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{9dd9b834-61c2-4195-a23b-c81d6a4c85ac}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-              </callout>
-            </settings>
-          </rule>
-          <rule description="Show by day" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" key="{d2df60fb-4d9a-401d-976d-3c1aad695aa5}">
-            <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                <families/>
-                <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="0,0,0,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                    <data_defined_properties>
-                      <Option type="Map">
-                        <Option value="" name="name" type="QString"/>
-                        <Option name="properties"/>
-                        <Option value="collection" name="type" type="QString"/>
-                      </Option>
-                    </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                      <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>
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <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>
-                            <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>
-                          </Option>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                    </layer>
-                  </symbol>
-                </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </dd_properties>
-                <substitutions/>
-              </text-style>
-              <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-              <dd_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                    <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>
-                  </Option>
-                  <Option value="collection" name="type" type="QString"/>
-                </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="ddProperties" type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{69375168-2d73-46fb-9c07-79443c94096f}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-              </callout>
-            </settings>
-          </rule>
-          <rule active="0" description="List for legends" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" key="{d30b06e2-90ac-43fb-bc5a-724282e8dd7d}">
-            <rule active="0" description="21KM" filter="&quot;Source&quot; = '21KM'" key="{1dd4b407-46ba-4799-9f7d-d639fd08b63d}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="210,32,39,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="210,32,39,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <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>
-                        <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>
-                        <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>
-                        <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>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="3" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{28abdab2-5d7a-42ca-a948-a7f2b847becd}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" description="10KM" filter="&quot;Source&quot; = '10KM'" key="{5f9181e2-ca8b-407d-b484-583f4bc93730}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="128" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="103,34,144,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="103,34,144,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <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>
-                        <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>
-                        <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>
-                        <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>
-                      </Option>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="UnknownGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{b709b8cf-68f7-4119-b35f-8a2c41f164e3}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" description="5KM" filter="&quot;Source&quot; ILIKE '5KM%'" key="{0a88f55a-567f-41c1-8d6d-de85d57ccb08}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{88308dff-0a3b-4eeb-8308-e5165248d525}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-            <rule active="0" description="Trail" filter="&quot;Source&quot; = 'Trail'" key="{20316ea9-3508-448e-a30b-d226a23691fc}">
-              <settings calloutType="simple">
-                <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="1" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="255,255,255,255" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
-                  <families/>
-                  <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="64" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="0"/>
-                  <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                  <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="1" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="1" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="1" shapeSizeType="0" shapeFillColor="145,211,55,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="1" shapeRadiiY="1">
-                    <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                    <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
-                      <data_defined_properties>
-                        <Option type="Map">
-                          <Option value="" name="name" type="QString"/>
-                          <Option name="properties"/>
-                          <Option value="collection" name="type" type="QString"/>
-                        </Option>
-                      </data_defined_properties>
-                      <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
-                        <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>
-                        <data_defined_properties>
-                          <Option type="Map">
-                            <Option value="" name="name" type="QString"/>
-                            <Option name="properties"/>
-                            <Option value="collection" name="type" type="QString"/>
-                          </Option>
-                        </data_defined_properties>
-                      </layer>
-                    </symbol>
-                  </background>
-                  <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
-                  <dd_properties>
-                    <Option type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </Option>
-                  </dd_properties>
-                  <substitutions/>
-                </text-style>
-                <text-format decimals="0" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-                <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="10" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="20" allowDegraded="1" dist="2" layerType="PointGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="6" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="AllowOverlapIfRequired" maxCurvedCharAngleOut="-20" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-                <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="2" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="10000000"/>
-                <dd_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <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>
-                      <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>
-                      <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>
-                      <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>
-                    </Option>
-                    <Option value="collection" name="type" type="QString"/>
-                  </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="ddProperties" type="Map">
-                      <Option value="" name="name" type="QString"/>
-                      <Option name="properties"/>
-                      <Option value="collection" name="type" type="QString"/>
-                    </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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{85fb1e9b-c6bd-4f85-8693-e5a2471a67e8}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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>
-                </callout>
-              </settings>
-            </rule>
-          </rule>
-        </rules>
-      </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="dualview/previewExpressions" type="List">
-            <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
-          </Option>
-          <Option value="0" name="embeddedWidgets/count" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
-        </Option>
-      </customproperties>
-      <blendMode>0</blendMode>
-      <featureBlendMode>0</featureBlendMode>
-      <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="100000" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
-          <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
-              <data_defined_properties>
-                <Option type="Map">
-                  <Option value="" name="name" type="QString"/>
-                  <Option name="properties"/>
-                  <Option value="collection" name="type" type="QString"/>
-                </Option>
-              </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{356245f8-3346-4eac-9a56-56f8cd3c59de}">
-                <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>
-                <data_defined_properties>
-                  <Option type="Map">
-                    <Option value="" name="name" type="QString"/>
-                    <Option name="properties"/>
-                    <Option value="collection" name="type" type="QString"/>
-                  </Option>
-                </data_defined_properties>
-              </layer>
-            </symbol>
-          </axisSymbol>
-        </DiagramCategory>
-      </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
-        <properties>
-          <Option type="Map">
-            <Option value="" name="name" type="QString"/>
-            <Option name="properties"/>
-            <Option value="collection" name="type" type="QString"/>
-          </Option>
-        </properties>
-      </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
-        <activeChecks/>
-        <checkConfiguration/>
-      </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
-      <referencedLayers/>
-      <fieldConfiguration>
-        <field configurationFlags="None" name="Name">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="begin">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="end">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="Distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="RouteLen">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="Sort">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="day">
-          <editWidget type="Range">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="Source">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="length_km">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="length_m">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="org_fid">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="distance">
-          <editWidget type="TextEdit">
-            <config>
-              <Option type="Map">
-                <Option value="0" name="IsMultiline" type="QString"/>
-                <Option value="0" name="UseHtml" type="QString"/>
-              </Option>
-            </config>
-          </editWidget>
-        </field>
-        <field configurationFlags="None" name="quadrant">
-          <editWidget type="">
-            <config>
-              <Option/>
-            </config>
-          </editWidget>
-        </field>
-      </fieldConfiguration>
-      <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="begin"/>
-        <alias index="2" name="" field="end"/>
-        <alias index="3" name="" field="Distance"/>
-        <alias index="4" name="" field="RouteLen"/>
-        <alias index="5" name="" field="Sort"/>
-        <alias index="6" name="" field="day"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="length_m"/>
-        <alias index="10" name="" field="org_fid"/>
-        <alias index="11" name="" field="distance"/>
-        <alias index="12" name="" field="quadrant"/>
-      </aliases>
-      <splitPolicies>
-        <policy field="Name" policy="Duplicate"/>
-        <policy field="begin" policy="Duplicate"/>
-        <policy field="end" policy="Duplicate"/>
-        <policy field="Distance" policy="Duplicate"/>
-        <policy field="RouteLen" policy="Duplicate"/>
-        <policy field="Sort" policy="Duplicate"/>
-        <policy field="day" policy="Duplicate"/>
-        <policy field="Source" policy="Duplicate"/>
-        <policy field="length_km" policy="Duplicate"/>
-        <policy field="length_m" policy="Duplicate"/>
-        <policy field="org_fid" policy="Duplicate"/>
-        <policy field="distance" policy="Duplicate"/>
-        <policy field="quadrant" policy="Duplicate"/>
-      </splitPolicies>
-      <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <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="Sort"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <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 notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Sort" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="quadrant" unique_strength="0"/>
-      </constraints>
-      <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="Distance" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Sort" exp=""/>
-        <constraint desc="" field="day" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
-        <constraint desc="" field="quadrant" exp=""/>
-      </constraintExpressions>
-      <expressionfields/>
-      <attributeactions>
-        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
-      </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;Source&quot;" actionWidgetStyle="dropDown">
-        <columns>
-          <column width="-1" type="actions" hidden="1"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="begin" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="Distance" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="Sort" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="quadrant" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
-        </columns>
-      </attributetableconfig>
-      <conditionalstyles>
-        <rowstyles/>
-        <fieldstyles/>
-      </conditionalstyles>
-      <storedexpressions/>
-      <editform tolerant="1"></editform>
-      <editforminit/>
-      <editforminitcodesource>0</editforminitcodesource>
-      <editforminitfilepath>.</editforminitfilepath>
-      <editforminitcode><![CDATA[# -*- coding: utf-8 -*-
-"""
-QGIS forms can have a Python function that is called when the form is
-opened.
-
-Use this function to add extra logic to your forms.
-
-Enter the name of the function in the "Python Init function"
-field.
-An example follows:
-"""
-from qgis.PyQt.QtWidgets import QWidget
-
-def my_form_open(dialog, layer, feature):
-	geom = feature.geometry()
-	control = dialog.findChild(QWidget, "MyLineEdit")
-]]></editforminitcode>
-      <featformsuppress>0</featformsuppress>
-      <editorlayout>generatedlayout</editorlayout>
-      <editable>
-        <field name="Distance" editable="1"/>
-        <field name="Name" editable="1"/>
-        <field name="RouteLen" editable="1"/>
-        <field name="Sort" editable="1"/>
-        <field name="Source" editable="1"/>
-        <field name="begin" editable="1"/>
-        <field name="day" editable="1"/>
-        <field name="descriptio" editable="1"/>
-        <field name="distance" editable="1"/>
-        <field name="end" editable="1"/>
-        <field name="length_km" editable="1"/>
-        <field name="length_m" editable="1"/>
-        <field name="org_fid" editable="1"/>
-        <field name="quadrant" editable="1"/>
-        <field name="timestamp" editable="1"/>
-      </editable>
-      <labelOnTop>
-        <field name="Distance" labelOnTop="0"/>
-        <field name="Name" labelOnTop="0"/>
-        <field name="RouteLen" labelOnTop="0"/>
-        <field name="Sort" labelOnTop="0"/>
-        <field name="Source" labelOnTop="0"/>
-        <field name="begin" labelOnTop="0"/>
-        <field name="day" labelOnTop="0"/>
-        <field name="descriptio" labelOnTop="0"/>
-        <field name="distance" labelOnTop="0"/>
-        <field name="end" labelOnTop="0"/>
-        <field name="length_km" labelOnTop="0"/>
-        <field name="length_m" labelOnTop="0"/>
-        <field name="org_fid" labelOnTop="0"/>
-        <field name="quadrant" labelOnTop="0"/>
-        <field name="timestamp" labelOnTop="0"/>
-      </labelOnTop>
-      <reuseLastValue>
-        <field name="Distance" reuseLastValue="0"/>
-        <field name="Name" reuseLastValue="0"/>
-        <field name="RouteLen" reuseLastValue="0"/>
-        <field name="Sort" reuseLastValue="0"/>
-        <field name="Source" reuseLastValue="0"/>
-        <field name="begin" reuseLastValue="0"/>
-        <field name="day" reuseLastValue="0"/>
-        <field name="descriptio" reuseLastValue="0"/>
-        <field name="distance" reuseLastValue="0"/>
-        <field name="end" reuseLastValue="0"/>
-        <field name="length_km" reuseLastValue="0"/>
-        <field name="length_m" reuseLastValue="0"/>
-        <field name="org_fid" reuseLastValue="0"/>
-        <field name="quadrant" reuseLastValue="0"/>
-        <field name="timestamp" reuseLastValue="0"/>
-      </reuseLastValue>
-      <dataDefinedFieldProperties/>
-      <widgets/>
-      <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
-      <mapTip enabled="1">Text</mapTip>
-    </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -21046,13 +19657,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -21061,7 +19672,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21069,7 +19680,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}">
+            <layer enabled="1" id="{5dca61e4-69c2-4b97-a344-09472092e8cb}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -21110,7 +19721,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21118,7 +19729,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}">
+            <layer enabled="1" id="{2b7f0663-4f31-4cf8-bbf3-143d5c83ce16}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -21143,7 +19754,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21151,7 +19762,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}">
+            <layer enabled="1" id="{3f847d5f-1263-4a56-8bac-c2ae3f9595c6}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -21184,9 +19795,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="singleSymbol" symbollevels="0">
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21194,7 +19805,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}">
+            <layer enabled="1" id="{b2a8fd19-250d-468e-86cf-45dc2fb24d6e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -21232,30 +19843,30 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -21264,9 +19875,9 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="area"/>
-        <alias index="2" name="" field="rotation"/>
+        <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"/>
@@ -21274,29 +19885,29 @@ def my_form_open(dialog, layer, feature):
         <policy field="rotation" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="area"/>
-        <default applyOnUpdate="0" expression="" field="rotation"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="area"/>
+        <default expression="" applyOnUpdate="0" field="rotation"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="area" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="rotation" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="area" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="rotation" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="area" exp=""/>
-        <constraint desc="" field="rotation" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="area"/>
+        <constraint desc="" exp="" field="rotation"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;rotation&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="area" width="-1" type="field" hidden="0"/>
-          <column name="rotation" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="area" type="field" hidden="0"/>
+          <column width="-1" name="rotation" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -21320,21 +19931,21 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </extent>
       <wgs84extent>
-        <xmin>18.37527697005977245</xmin>
-        <ymin>-33.94584879231483399</ymin>
+        <xmin>18.38475260238231712</xmin>
+        <ymin>-33.92228210414224776</ymin>
         <xmax>18.42008414500160995</xmax>
-        <ymax>-33.89948351196304799</ymax>
+        <ymax>-33.9031231546964662</ymax>
       </wgs84extent>
       <id>timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f</id>
-      <datasource>./timelapse.shp|layername=timelapse</datasource>
+      <datasource>./timelapse.shp|layername=timelapse|subset="first_runn" &lt; '06:59:45.000000' AND "last_runne" >= '06:59:35.000000'</datasource>
       <keywordList>
         <value></value>
       </keywordList>
@@ -21386,7 +19997,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21411,13 +20022,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -21426,7 +20037,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21434,7 +20045,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}">
+            <layer enabled="1" id="{365af962-5b68-4f08-a049-7f2e6c9b8744}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -21475,7 +20086,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21483,7 +20094,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}">
+            <layer enabled="1" id="{61fe86b0-6d42-4d2e-95d5-4cb2f34e92b0}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -21508,7 +20119,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21516,7 +20127,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}">
+            <layer enabled="1" id="{8b3ece8f-b62e-415d-87f6-160d0b30ad39}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -21549,12 +20160,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule checkstate="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0"/>
+          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" checkstate="0" label="All distances" symbol="0"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -21562,7 +20173,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="1" pass="0" enabled="1" class="SimpleMarker" id="{929956be-fb51-4c17-886b-1ed43d282cde}">
+            <layer enabled="1" id="{929956be-fb51-4c17-886b-1ed43d282cde}" locked="1" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -21628,11 +20239,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -21640,7 +20251,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}">
+              <layer enabled="1" id="{9d69e3ac-db5a-4f20-8256-2c75ed1401ad}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -21682,7 +20293,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -21691,35 +20302,35 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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">
@@ -21729,14 +20340,14 @@ def my_form_open(dialog, layer, feature):
             </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">
@@ -21746,7 +20357,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="HideFromWms|HideFromWfs" name="Source">
+        <field name="Source" configurationFlags="HideFromWms|HideFromWfs">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -21756,42 +20367,42 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -21800,19 +20411,19 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="Name"/>
-        <alias index="1" name="" field="descriptio"/>
-        <alias index="2" name="" field="timestamp"/>
-        <alias index="3" name="" field="begin"/>
-        <alias index="4" name="" field="end"/>
-        <alias index="5" name="" field="RouteLen"/>
-        <alias index="6" name="" field="Source"/>
-        <alias index="7" name="" field="length_m"/>
-        <alias index="8" name="" field="length_km"/>
-        <alias index="9" name="" field="org_fid"/>
-        <alias index="10" name="" field="distance"/>
-        <alias index="11" name="" field="first_runn"/>
-        <alias index="12" name="" field="last_runne"/>
+        <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"/>
@@ -21830,70 +20441,70 @@ def my_form_open(dialog, layer, feature):
         <policy field="last_runne" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="Name"/>
-        <default applyOnUpdate="0" expression="" field="descriptio"/>
-        <default applyOnUpdate="0" expression="" field="timestamp"/>
-        <default applyOnUpdate="0" expression="" field="begin"/>
-        <default applyOnUpdate="0" expression="" field="end"/>
-        <default applyOnUpdate="0" expression="" field="RouteLen"/>
-        <default applyOnUpdate="0" expression="" field="Source"/>
-        <default applyOnUpdate="0" expression="" field="length_m"/>
-        <default applyOnUpdate="0" expression="" field="length_km"/>
-        <default applyOnUpdate="0" expression="" field="org_fid"/>
-        <default applyOnUpdate="0" expression="" field="distance"/>
-        <default applyOnUpdate="0" expression="" field="first_runn"/>
-        <default applyOnUpdate="0" expression="" field="last_runne"/>
+        <default expression="" applyOnUpdate="0" field="Name"/>
+        <default expression="" applyOnUpdate="0" field="descriptio"/>
+        <default expression="" applyOnUpdate="0" field="timestamp"/>
+        <default expression="" applyOnUpdate="0" field="begin"/>
+        <default expression="" applyOnUpdate="0" field="end"/>
+        <default expression="" applyOnUpdate="0" field="RouteLen"/>
+        <default expression="" applyOnUpdate="0" field="Source"/>
+        <default expression="" applyOnUpdate="0" field="length_m"/>
+        <default expression="" applyOnUpdate="0" field="length_km"/>
+        <default expression="" applyOnUpdate="0" field="org_fid"/>
+        <default expression="" applyOnUpdate="0" field="distance"/>
+        <default expression="" applyOnUpdate="0" field="first_runn"/>
+        <default expression="" applyOnUpdate="0" field="last_runne"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Name" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="descriptio" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="timestamp" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="begin" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="end" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="RouteLen" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="Source" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_m" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="length_km" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="org_fid" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="distance" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="first_runn" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="last_runne" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Name" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="descriptio" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="timestamp" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="begin" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="end" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="RouteLen" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="Source" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_m" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="length_km" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="org_fid" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="distance" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="first_runn" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="last_runne" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="Name" exp=""/>
-        <constraint desc="" field="descriptio" exp=""/>
-        <constraint desc="" field="timestamp" exp=""/>
-        <constraint desc="" field="begin" exp=""/>
-        <constraint desc="" field="end" exp=""/>
-        <constraint desc="" field="RouteLen" exp=""/>
-        <constraint desc="" field="Source" exp=""/>
-        <constraint desc="" field="length_m" exp=""/>
-        <constraint desc="" field="length_km" exp=""/>
-        <constraint desc="" field="org_fid" exp=""/>
-        <constraint desc="" field="distance" exp=""/>
-        <constraint desc="" field="first_runn" exp=""/>
-        <constraint desc="" field="last_runne" exp=""/>
+        <constraint desc="" exp="" field="Name"/>
+        <constraint desc="" exp="" field="descriptio"/>
+        <constraint desc="" exp="" field="timestamp"/>
+        <constraint desc="" exp="" field="begin"/>
+        <constraint desc="" exp="" field="end"/>
+        <constraint desc="" exp="" field="RouteLen"/>
+        <constraint desc="" exp="" field="Source"/>
+        <constraint desc="" exp="" field="length_m"/>
+        <constraint desc="" exp="" field="length_km"/>
+        <constraint desc="" exp="" field="org_fid"/>
+        <constraint desc="" exp="" field="distance"/>
+        <constraint desc="" exp="" field="first_runn"/>
+        <constraint desc="" exp="" field="last_runne"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;first_runn&quot;">
         <columns>
-          <column name="begin" width="179" type="field" hidden="0"/>
-          <column name="RouteLen" width="-1" type="field" hidden="0"/>
-          <column name="Source" width="-1" type="field" hidden="0"/>
+          <column width="179" name="begin" type="field" hidden="0"/>
+          <column width="-1" name="RouteLen" type="field" hidden="0"/>
+          <column width="-1" name="Source" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="Name" width="-1" type="field" hidden="0"/>
-          <column name="length_m" width="-1" type="field" hidden="0"/>
-          <column name="length_km" width="-1" type="field" hidden="0"/>
-          <column name="org_fid" width="-1" type="field" hidden="0"/>
-          <column name="first_runn" width="-1" type="field" hidden="0"/>
-          <column name="last_runne" width="-1" type="field" hidden="0"/>
-          <column name="descriptio" width="-1" type="field" hidden="0"/>
-          <column name="timestamp" width="-1" type="field" hidden="0"/>
-          <column name="end" width="-1" type="field" hidden="0"/>
-          <column name="distance" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="Name" type="field" hidden="0"/>
+          <column width="-1" name="length_m" type="field" hidden="0"/>
+          <column width="-1" name="length_km" type="field" hidden="0"/>
+          <column width="-1" name="org_fid" type="field" hidden="0"/>
+          <column width="-1" name="first_runn" type="field" hidden="0"/>
+          <column width="-1" name="last_runne" type="field" hidden="0"/>
+          <column width="-1" name="descriptio" type="field" hidden="0"/>
+          <column width="-1" name="timestamp" type="field" hidden="0"/>
+          <column width="-1" name="end" type="field" hidden="0"/>
+          <column width="-1" name="distance" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21984,7 +20595,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiLineString" geometry="Line" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="0" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" simplifyMaxScale="1" geometry="Line" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiLineString" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -22058,13 +20669,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22073,7 +20684,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22081,7 +20692,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{963b9e9e-c03d-476c-a792-effe8028add1}">
+            <layer enabled="1" id="{963b9e9e-c03d-476c-a792-effe8028add1}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -22122,7 +20733,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22130,7 +20741,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7362ff98-e908-498b-82c9-17b74285e0f4}">
+            <layer enabled="1" id="{7362ff98-e908-498b-82c9-17b74285e0f4}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -22155,7 +20766,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22163,7 +20774,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{20af25c5-139a-4a43-b257-4147f560bd1e}">
+            <layer enabled="1" id="{20af25c5-139a-4a43-b257-4147f560bd1e}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -22196,13 +20807,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="RuleRenderer" symbollevels="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule label="Car" filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" symbol="0"/>
-          <rule label="Walking" filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" symbol="1"/>
+          <rule filter="&quot;type&quot; IS 'car'" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" label="Car" symbol="0"/>
+          <rule filter="&quot;type&quot; IS 'walk'" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" label="Walking" symbol="1"/>
         </rules>
         <symbols>
-          <symbol frame_rate="10" name="0" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="0" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22210,7 +20821,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}">
+            <layer enabled="1" id="{6c421d2b-1ff6-4baa-90fd-36ea46fbc2a7}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -22249,7 +20860,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol frame_rate="10" name="1" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="1" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22257,7 +20868,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}">
+            <layer enabled="1" id="{bdc4960d-4091-4009-ae0a-eaa355da9cac}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="flat" name="capstyle" type="QString"/>
@@ -22295,7 +20906,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer locked="0" pass="0" enabled="1" class="MarkerLine" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}">
+            <layer enabled="1" id="{c75a7de7-f06a-429a-b940-1629f9306aaa}" locked="0" pass="0" class="MarkerLine">
               <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"/>
@@ -22321,7 +20932,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol frame_rate="10" name="@1@1" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+              <symbol name="@1@1" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -22329,7 +20940,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="FilledMarker" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}">
+                <layer enabled="1" id="{c86ba77b-3947-4686-9d93-5c997e6dde40}" locked="0" pass="0" class="FilledMarker">
                   <Option type="Map">
                     <Option value="0" name="angle" type="QString"/>
                     <Option value="103,34,144,255" name="color" type="QString"/>
@@ -22351,7 +20962,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol frame_rate="10" name="@@1@1@0" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="@@1@1@0" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -22359,7 +20970,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{61856921-c649-4f9a-86f1-1032eeec1eca}">
+                    <layer enabled="1" id="{61856921-c649-4f9a-86f1-1032eeec1eca}" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -22403,11 +21014,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -22415,7 +21026,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}">
+              <layer enabled="1" id="{a7cba8f5-0f3c-493e-b410-24187933a3cb}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -22457,7 +21068,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="2" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="2">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22466,21 +21077,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -22489,34 +21100,34 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="type"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="type"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="type" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="type" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="type" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="type"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="type" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="type" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22561,7 +21172,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="Point" geometry="Point" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="0" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Point" simplifyLocal="1" simplifyDrawingHints="0" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="Point" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -22635,13 +21246,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22650,7 +21261,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22658,7 +21269,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}">
+            <layer enabled="1" id="{360268ec-74bf-49a5-9cdc-3d49f645479f}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -22699,7 +21310,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22707,7 +21318,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}">
+            <layer enabled="1" id="{3099a785-e2c1-43f1-b1ca-d30be080bcff}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -22732,7 +21343,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22740,7 +21351,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}">
+            <layer enabled="1" id="{809edd37-7b3d-41e3-bd52-ca714bb8a233}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -22773,15 +21384,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fieldName="label" fontWeight="63" legendString="Aa" textOpacity="1" useSubstitutions="0" namedStyle="Semibold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="15" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Semibold" fontWeight="63" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="15" textColor="0,0,0,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="1" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="1" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -22789,7 +21400,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -22813,7 +21424,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -22823,9 +21434,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="3" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-          <placement rotationAngle="0" centroidWhole="0" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="4" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="0" layerType="UnknownGeometry" offsetUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="0" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-          <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="1" fontMaxPixelSize="10000" obstacle="1" scaleMin="0" minFeatureSize="0" maxNumLabels="2000" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="0" scaleMax="0"/>
+          <text-format multilineAlign="3" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+          <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="4" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MM" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="UnknownGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="0" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="0" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+          <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="0" scaleMax="0" scaleVisibility="0" maxNumLabels="2000" zIndex="0" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="1" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -22845,7 +21456,7 @@ def my_form_open(dialog, layer, feature):
               <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{3409b538-302c-4d60-bc80-55250d60491b}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -22873,11 +21484,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" underline="0" style="0" bold="0" italic="1"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="0" underline="0" italic="1" strikethrough="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -22885,7 +21496,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}">
+              <layer enabled="1" id="{1a7eb0b7-8653-44eb-b563-b080d6323cf8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -22927,7 +21538,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="18" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="18" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -22936,21 +21547,21 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <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/>
@@ -22959,33 +21570,33 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="label"/>
+        <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 applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="label" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="label"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
+          <column width="-1" name="label" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
         </columns>
       </attributetableconfig>
@@ -23031,7 +21642,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip enabled="1"></mapTip>
     </maplayer>
-    <maplayer simplifyDrawingTol="1" type="vector" refreshOnNotifyEnabled="0" legendPlaceholderImage="" readOnly="0" wkbType="MultiPolygon" geometry="Polygon" symbologyReferenceScale="-1" simplifyMaxScale="1" simplifyAlgorithm="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" simplifyDrawingHints="1" autoRefreshEnabled="0" labelsEnabled="1" maxScale="0" autoRefreshTime="0" simplifyLocal="1" styleCategories="AllStyleCategories" minScale="100000000">
+    <maplayer hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" simplifyMaxScale="1" geometry="Polygon" simplifyLocal="1" simplifyDrawingHints="1" symbologyReferenceScale="-1" refreshOnNotifyMessage="" autoRefreshTime="0" refreshOnNotifyEnabled="0" readOnly="0" autoRefreshEnabled="0" minScale="100000000" simplifyAlgorithm="0" styleCategories="AllStyleCategories" wkbType="MultiPolygon" legendPlaceholderImage="" type="vector" simplifyDrawingTol="1">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -23097,7 +21708,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial miny="0" minz="0" minx="0" dimensions="2" crs="" maxz="0" maxy="0" maxx="0"/>
+          <spatial minx="0" crs="" minz="0" dimensions="2" miny="0" maxy="0" maxx="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -23122,13 +21733,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal limitMode="0" durationField="" startExpression="" mode="0" enabled="0" endField="" endExpression="" accumulate="0" durationUnit="min" startField="" fixedDuration="0">
+      <temporal endField="" enabled="0" startExpression="" mode="0" limitMode="0" startField="" durationField="" fixedDuration="0" endExpression="" durationUnit="min" accumulate="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation respectLayerSymbol="1" symbology="Line" zscale="1" zoffset="0" type="IndividualFeatures" extrusion="0" extrusionEnabled="0" clamping="Terrain" binding="Centroid" showMarkerSymbolInSurfacePlots="0">
+      <elevation zoffset="0" extrusion="0" respectLayerSymbol="1" symbology="Line" showMarkerSymbolInSurfacePlots="0" extrusionEnabled="0" binding="Centroid" type="IndividualFeatures" clamping="Terrain" zscale="1">
         <data-defined-properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -23137,7 +21748,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -23145,7 +21756,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}">
+            <layer enabled="1" id="{21311e5c-9c25-4470-8640-7b6d873bbd81}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -23186,7 +21797,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -23194,7 +21805,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}">
+            <layer enabled="1" id="{653976c3-86ea-4acf-889f-aa8a836d6d67}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -23219,7 +21830,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -23227,7 +21838,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}">
+            <layer enabled="1" id="{bc02070a-e5a5-4a9a-bb2f-12b35b0bad5f}" locked="0" pass="0" class="SimpleMarker">
               <Option type="Map">
                 <Option value="0" name="angle" type="QString"/>
                 <Option value="square" name="cap_style" type="QString"/>
@@ -23260,17 +21871,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 forceraster="0" symbollevels="0" referencescale="-1" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" enableorderby="0" forceraster="0" type="nullSymbol" symbollevels="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule description="Show water tables" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
+          <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" key="{c438992b-4486-4e7d-a594-2c46fe177154}" description="Show water tables">
             <settings calloutType="simple">
-              <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" isExpression="0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="31,120,180,255" textOrientation="horizontal" fieldName="label" fontWeight="75" legendString="Aa" textOpacity="0.90000000000000002" useSubstitutions="0" namedStyle="Bold" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+              <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="Bold" fontWeight="75" blendMode="0" fontWordSpacing="0" fieldName="label" fontItalic="0" fontSize="8" textColor="31,120,180,255" isExpression="0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" legendString="Aa" capitalization="0" textOpacity="0.90000000000000002" allowHtml="0">
                 <families/>
-                <text-buffer bufferOpacity="0.40000000000000002" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="0.75" bufferDraw="0" bufferNoFill="0"/>
-                <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-                <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0.75" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0.75" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0.29999999999999999" shapeDraw="1" shapeSizeType="0" shapeFillColor="255,255,255,204" shapeOpacity="0.59999999999999998" shapeOffsetY="-0.14999999999999999" shapeBorderColor="31,120,206,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0.5" shapeRadiiY="0.5">
-                  <symbol frame_rate="10" name="markerSymbol" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+                <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="0.40000000000000002" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="0.75" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="0" bufferBlendMode="0"/>
+                <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+                <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0.5" shapeType="0" shapeRadiiY="0.5" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeOpacity="0.59999999999999998" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="1" shapeBorderWidth="0.75" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="-0.14999999999999999" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,204" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeBorderColor="31,120,206,255" shapeOffsetX="0">
+                  <symbol name="markerSymbol" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -23278,7 +21889,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleMarker">
                       <Option type="Map">
                         <Option value="0" name="angle" type="QString"/>
                         <Option value="square" name="cap_style" type="QString"/>
@@ -23309,7 +21920,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+                  <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option value="" name="name" type="QString"/>
@@ -23317,7 +21928,7 @@ def my_form_open(dialog, layer, feature):
                         <Option value="collection" name="type" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                    <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                       <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"/>
@@ -23341,7 +21952,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+                <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -23351,9 +21962,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format decimals="3" useMaxLineLengthForAutoWrap="1" rightDirectionSymbol=">" wrapChar="" autoWrapLength="0" multilineAlign="1" addDirectionSymbol="0" plussign="0" reverseDirectionSymbol="0" placeDirectionSymbol="0" leftDirectionSymbol="&lt;" formatNumbers="0"/>
-              <placement rotationAngle="0" centroidWhole="1" placementFlags="10" centroidInside="0" lineAnchorType="0" preserveRotation="1" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" distMapUnitScale="3x:0,0,0,0,0,0" distUnits="MM" geometryGeneratorType="PointGeometry" lineAnchorTextPoint="CenterOfText" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" quadOffset="1" priority="5" lineAnchorPercent="0.5" overrunDistanceUnit="MM" geometryGenerator="" maxCurvedCharAngleIn="25" allowDegraded="0" dist="0" layerType="PolygonGeometry" offsetUnits="MapUnit" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" fitInPolygonOnly="0" offsetType="0" repeatDistance="0" placement="0" rotationUnit="AngleDegrees" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" repeatDistanceUnits="MM" xOffset="1" polygonPlacementFlags="2" overlapHandling="PreventOverlap" maxCurvedCharAngleOut="-25" overrunDistance="0" yOffset="0" lineAnchorClipping="0"/>
-              <rendering mergeLines="0" limitNumLabels="0" unplacedVisibility="0" obstacleType="0" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" obstacle="1" scaleMin="1" minFeatureSize="0" maxNumLabels="6" drawLabels="1" fontMinPixelSize="3" scaleVisibility="0" fontLimitPixelSize="0" upsidedownLabels="0" labelPerPart="0" zIndex="5" scaleMax="10000000"/>
+              <text-format multilineAlign="1" addDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" autoWrapLength="0" wrapChar="" formatNumbers="0" decimals="3" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" placeDirectionSymbol="0"/>
+              <placement preserveRotation="1" geometryGeneratorType="PointGeometry" rotationUnit="AngleDegrees" allowDegraded="0" distUnits="MM" quadOffset="1" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGenerator="" repeatDistanceUnits="MM" offsetUnits="MapUnit" fitInPolygonOnly="0" centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" offsetType="0" layerType="PolygonGeometry" maxCurvedCharAngleOut="-25" rotationAngle="0" overrunDistance="0" distMapUnitScale="3x:0,0,0,0,0,0" xOffset="1" lineAnchorClipping="0" placement="0" polygonPlacementFlags="2" lineAnchorType="0" overrunDistanceUnit="MM" overlapHandling="PreventOverlap" repeatDistance="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" centroidWhole="1" maxCurvedCharAngleIn="25" dist="0" placementFlags="10" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" lineAnchorPercent="0.5" priority="5" lineAnchorTextPoint="CenterOfText" yOffset="0"/>
+              <rendering obstacleType="0" upsidedownLabels="0" minFeatureSize="0" obstacle="1" mergeLines="0" scaleMin="1" scaleMax="10000000" scaleVisibility="0" maxNumLabels="6" zIndex="5" unplacedVisibility="0" labelPerPart="0" fontLimitPixelSize="0" limitNumLabels="0" drawLabels="1" obstacleFactor="0.76000000000000001" fontMaxPixelSize="10000" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -23373,7 +21984,7 @@ def my_form_open(dialog, layer, feature):
                   <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; name=&quot;symbol&quot; force_rhr=&quot;0&quot; is_animated=&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 locked=&quot;0&quot; pass=&quot;0&quot; enabled=&quot;1&quot; class=&quot;SimpleLine&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option 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="&lt;symbol name=&quot;symbol&quot; is_animated=&quot;0&quot; type=&quot;line&quot; frame_rate=&quot;10&quot; alpha=&quot;1&quot; force_rhr=&quot;0&quot; clip_to_extent=&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 enabled=&quot;1&quot; id=&quot;{243a5954-3f57-4c35-b04c-96c82208d9f4}&quot; locked=&quot;0&quot; pass=&quot;0&quot; class=&quot;SimpleLine&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"/>
@@ -23410,11 +22021,11 @@ def my_form_open(dialog, layer, feature):
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
       <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory opacity="1" showAxis="0" spacing="0" enabled="0" rotationOffset="270" barWidth="5" sizeScale="3x:0,0,0,0,0,0" minScaleDenominator="0" backgroundColor="#ffffff" lineSizeScale="3x:0,0,0,0,0,0" scaleBasedVisibility="0" penColor="#000000" diagramOrientation="Up" maxScaleDenominator="1e+08" spacingUnit="MM" backgroundAlpha="255" direction="1" lineSizeType="MM" minimumSize="0" penWidth="0" scaleDependency="Area" width="15" penAlpha="255" sizeType="MM" height="15" spacingUnitScale="3x:0,0,0,0,0,0" labelPlacementMethod="XHeight">
-          <fontProperties strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" underline="0" style="" bold="0" italic="0"/>
-          <attribute colorOpacity="1" label="" field="" color="#000000"/>
+        <DiagramCategory width="15" backgroundAlpha="255" penWidth="0" maxScaleDenominator="1e+08" spacingUnit="MM" spacing="0" sizeScale="3x:0,0,0,0,0,0" height="15" penColor="#000000" penAlpha="255" minimumSize="0" enabled="0" diagramOrientation="Up" scaleBasedVisibility="0" backgroundColor="#ffffff" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" minScaleDenominator="0" showAxis="0" lineSizeType="MM" opacity="1" lineSizeScale="3x:0,0,0,0,0,0" scaleDependency="Area" direction="1" sizeType="MM" labelPlacementMethod="XHeight" rotationOffset="270">
+          <fontProperties style="" underline="0" italic="0" strikethrough="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" bold="0"/>
+          <attribute colorOpacity="1" color="#000000" label="" field=""/>
           <axisSymbol>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -23422,7 +22033,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}">
+              <layer enabled="1" id="{c394a7e3-5ac7-4bf6-8c5f-d747bb1116c9}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -23464,7 +22075,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings placement="0" priority="0" showAll="1" linePlacementFlags="2" obstacle="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" zIndex="0" obstacle="0" showAll="1" linePlacementFlags="2" dist="0" placement="0">
         <properties>
           <Option type="Map">
             <Option value="" name="name" type="QString"/>
@@ -23473,7 +22084,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
+      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -23483,10 +22094,10 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </checkConfiguration>
       </geometryOptions>
-      <legend type="default-vector" showLabelLegend="0"/>
+      <legend showLabelLegend="0" type="default-vector"/>
       <referencedLayers/>
       <fieldConfiguration>
-        <field configurationFlags="None" name="id">
+        <field name="id" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -23496,7 +22107,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="table_set">
+        <field name="table_set" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -23506,7 +22117,7 @@ def my_form_open(dialog, layer, feature):
             </config>
           </editWidget>
         </field>
-        <field configurationFlags="None" name="label">
+        <field name="label" configurationFlags="None">
           <editWidget type="TextEdit">
             <config>
               <Option type="Map">
@@ -23516,14 +22127,14 @@ def my_form_open(dialog, layer, feature):
             </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/>
@@ -23532,11 +22143,11 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="table_set"/>
-        <alias index="2" name="" field="label"/>
-        <alias index="3" name="" field="races"/>
-        <alias index="4" name="" field="day"/>
+        <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"/>
@@ -23546,38 +22157,38 @@ def my_form_open(dialog, layer, feature):
         <policy field="day" policy="Duplicate"/>
       </splitPolicies>
       <defaults>
-        <default applyOnUpdate="0" expression="" field="id"/>
-        <default applyOnUpdate="0" expression="" field="table_set"/>
-        <default applyOnUpdate="0" expression="" field="label"/>
-        <default applyOnUpdate="0" expression="" field="races"/>
-        <default applyOnUpdate="0" expression="" field="day"/>
+        <default expression="" applyOnUpdate="0" field="id"/>
+        <default expression="" applyOnUpdate="0" field="table_set"/>
+        <default expression="" applyOnUpdate="0" field="label"/>
+        <default expression="" applyOnUpdate="0" field="races"/>
+        <default expression="" applyOnUpdate="0" field="day"/>
       </defaults>
       <constraints>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="id" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="table_set" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="label" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="races" unique_strength="0"/>
-        <constraint notnull_strength="0" exp_strength="0" constraints="0" field="day" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="id" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="table_set" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="label" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="races" exp_strength="0" unique_strength="0"/>
+        <constraint constraints="0" notnull_strength="0" field="day" exp_strength="0" unique_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint desc="" field="id" exp=""/>
-        <constraint desc="" field="table_set" exp=""/>
-        <constraint desc="" field="label" exp=""/>
-        <constraint desc="" field="races" exp=""/>
-        <constraint desc="" field="day" exp=""/>
+        <constraint desc="" exp="" field="id"/>
+        <constraint desc="" exp="" field="table_set"/>
+        <constraint desc="" exp="" field="label"/>
+        <constraint desc="" exp="" field="races"/>
+        <constraint desc="" exp="" field="day"/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
         <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig sortOrder="0" sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown">
+      <attributetableconfig actionWidgetStyle="dropDown" sortOrder="0" sortExpression="&quot;table_set&quot;">
         <columns>
-          <column name="id" width="-1" type="field" hidden="0"/>
+          <column width="-1" name="id" type="field" hidden="0"/>
           <column width="-1" type="actions" hidden="1"/>
-          <column name="table_set" width="-1" type="field" hidden="0"/>
-          <column name="label" width="-1" type="field" hidden="0"/>
-          <column name="day" width="-1" type="field" hidden="0"/>
-          <column name="races" width="130" type="field" hidden="0"/>
+          <column width="-1" name="table_set" type="field" hidden="0"/>
+          <column width="-1" name="label" type="field" hidden="0"/>
+          <column width="-1" name="day" type="field" hidden="0"/>
+          <column width="130" name="races" type="field" hidden="0"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -23623,11 +22234,11 @@ def my_form_open(dialog, layer, feature):
         <field name="table_set" labelOnTop="0"/>
       </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/>
@@ -23662,7 +22273,6 @@ def my_form_open(dialog, layer, feature):
     <layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
     <layer id="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a"/>
     <layer id="cone_groups_a294cfec_698f_4117_9483_173a4f6655d2"/>
-    <layer id="route_markers_17fe67d4_dbad_4b94_bbfa_e5f7af52a549"/>
     <layer id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
   </layerorder>
   <properties>
@@ -23832,7 +22442,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230911 - Gun Run 2023 - Marshal Plan 1.7.pdf</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/Marshal plan/20230911 - Gun Run 2023 - Marshal Plan 1.8.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -24008,311 +22618,312 @@ def my_form_open(dialog, layer, feature):
   </dataDefinedServerProperties>
   <visibility-presets>
     <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="0" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" style="default" visible="1"/>
+      <layer style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Elevation"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Elevation"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Ask Me" has-expanded-info="1">
-      <layer expanded="1" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" style="default" visible="1"/>
-      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" style="default" visible="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+      <layer style="default" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Ask Me"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Fencing" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default" visible="1"/>
+    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
       <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <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="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - inset" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
+    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+        <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{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 expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <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-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal map - main" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
+    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Routes"/>
         <checked-group-node id="Marshals"/>
+        <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
         <expanded-group-node id="Marshals"/>
+        <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-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Marshal plan" has-expanded-info="1">
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
-        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
-      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-      </expanded-legend-nodes>
-      <layer expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
-      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
-        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
-      </checked-legend-nodes>
-      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+    <visibility-preset name="Marshal plan" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer expanded="0" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <checked-group-nodes>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-        <checked-group-node id="OSM data"/>
-        <checked-group-node id="Feeding Stations"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Routes"/>
-        <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="OSM data"/>
-        <expanded-group-node id="Feeding Stations"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset has-checked-group-info="1" name="Routes" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" style="default" visible="1"/>
-      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="0"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
-        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
         <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
-        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
-        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="0"/>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" style="default" visible="1"/>
+      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer expanded="1" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" style="default" visible="1"/>
-      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <checked-group-nodes>
         <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="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
         <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <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="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Feeding Stations"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="1">
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="route_markers_022f7471_3d57_403e_b836_6019bd5d0709"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+        <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+        <checked-legend-node id="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="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 style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="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 style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <checked-group-nodes>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Feeding Stations"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
     <visibility-preset name="Start/Finish" has-expanded-info="1">
-      <layer expanded="0" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" style="default" visible="1"/>
-      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer expanded="1" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" style="Fencing" visible="1"/>
-      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer expanded="1" id="water_tables20170921142016467" style="default" visible="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer expanded="1" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" style="default" visible="1"/>
-      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer expanded="1" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" style="default" visible="1"/>
-      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
-      <layer expanded="1" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" style="default" visible="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer expanded="1" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" style="default" visible="1"/>
+      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+      <layer style="default" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
       <expanded-group-nodes>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Map"/>
         <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
         <expanded-group-node id="Marshal pages"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Routes/Markers"/>
         <expanded-group-node id="Feeding Stations"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -24343,11 +22954,11 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" name="Marshals" worldFileMap="" units="mm">
+    <Layout name="Marshals" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -24355,7 +22966,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}">
+          <layer enabled="1" id="{f771d1d0-b7e1-4277-a044-b9620bf1e07e}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -24378,9 +22989,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -24393,7 +23004,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -24401,7 +23012,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}">
+            <layer enabled="1" id="{b6ce6b4d-f07c-419e-89db-cd6667bc9eef}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -24427,9 +23038,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" sectionWidth="132.391" type="65647" excludeFromExports="0" zValue="6" referencePoint="0" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" positionLock="true" sectionY="0" visibility="1" frame="false" position="158.226,6.0007,mm" positionOnPage="158.226,6.0007,mm" sectionHeight="184.8" size="132.391,187.018,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="158.226,6.0007,mm" visibility="1" position="158.226,6.0007,mm" itemRotation="0" templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" id="" size="132.391,187.018,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="6" sectionWidth="132.391" frame="false" multiFrame="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionY="0" background="false" excludeFromExports="0" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" sectionHeight="187.018">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24443,9 +23054,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem wrapChar="" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="5" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="128.508,3.98741,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.1,mm" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="true" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="128.508,3.98741,mm" size="20.4703,32.2333,mm" columnCount="1" titleAlignment="1" frameJoinStyle="bevel" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="128" green="128" red="128" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="128.508,3.98741,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="bevel" positionOnPage="128.508,3.98741,mm" minSymbolSize="0" itemRotation="0" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.1,mm" title="" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="20.4703,32.2333,mm" id="" symbolHeight="4" zValue="5">
+        <FrameColor blue="128" red="128" green="128" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24462,13 +23073,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24476,7 +23087,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24500,7 +23111,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24510,13 +23121,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.8805579999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="11" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="11" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.8805579999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24524,7 +23135,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24548,7 +23159,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24558,13 +23169,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="1" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.1750019999999992" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="1">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.1750019999999992" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24572,7 +23183,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24596,7 +23207,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24606,13 +23217,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24620,7 +23231,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24644,7 +23255,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24654,13 +23265,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="3.8222239999999998" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="8" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="8" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="3.8222239999999998" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -24668,7 +23279,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -24692,7 +23303,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24707,11 +23318,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -24725,9 +23336,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="3" referencePoint="0" keepLayerSet="false" outlineWidthM="0.2,mm" groupUuid="" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="98.7828,149.027,mm" drawCanvasItems="false" positionOnPage="98.7828,149.027,mm" mapFlags="0" size="56.5192,54.5647,mm" background="true" id="Inset map" itemRotation="0" mapRotation="0" followPresetName="Marshal map - inset" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.2,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="98.7828,149.027,mm" visibility="1" followPreset="true" position="98.7828,149.027,mm" itemRotation="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" size="56.5192,54.5647,mm" frameJoinStyle="miter" blendMode="0" zValue="3" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - inset" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24740,11 +23351,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90659215121308279" ymin="-33.91073582826823696" xmin="18.3917833749645645" xmax="18.39607548048533303"/>
+        <Extent xmax="18.41126562861851212" xmin="18.40697388772057153" ymax="-33.9017837760004852" ymin="-33.90592710104210994"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24752,7 +23363,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}">
+              <layer enabled="1" id="{b3292a1d-888d-424f-bfcd-b29c6d2b9aac}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -24793,7 +23404,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24801,7 +23412,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}">
+              <layer enabled="1" id="{31983f8d-dbf0-4d90-8ea3-946fdfb75555}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -24833,12 +23444,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -24846,7 +23457,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -24870,7 +23481,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -24892,8 +23503,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" show="1" position="3" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" inverted="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}">
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" inverted="0">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -24901,7 +23512,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}">
+            <layer enabled="1" id="{76cfe4a7-d8db-4c3c-bbb9-5174ad436553}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -24937,16 +23548,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="2" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="3.53,6.0007,mm" drawCanvasItems="false" positionOnPage="3.53,6.0007,mm" mapFlags="0" size="142,187.018,mm" background="false" id="Main map" itemRotation="0" mapRotation="0" followPresetName="Marshal map - main" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.53,6.0007,mm" visibility="1" followPreset="true" position="3.53,6.0007,mm" itemRotation="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" size="142,187.018,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal map - main" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -24959,11 +23570,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90798769129818879" ymin="-33.90934028818313095" xmin="18.39341592405077463" xmax="18.3944429313991229"/>
+        <Extent xmax="18.40963321822056642" xmin="18.40860629811851723" ymax="-33.90317919753172049" ymin="-33.90453167951087465"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -24971,7 +23582,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}">
+              <layer enabled="1" id="{0127a3f8-e8e0-4f8a-8d28-0ec4a83626ff}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -25012,7 +23623,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25020,7 +23631,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}">
+              <layer enabled="1" id="{7158b503-47c7-43d8-b863-66e9308bf8c9}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -25052,12 +23663,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -25065,7 +23676,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -25089,7 +23700,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25111,16 +23722,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="47.1065" mapUuid="" type="65640" excludeFromExports="0" zValue="1" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_500.png" anchorPoint="0" groupUuid="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" pictureHeight="26.6623" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" positionLock="true" visibility="1" frame="false" position="246.665,178.41,mm" positionOnPage="246.665,178.41,mm" size="47.1065,27.6,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="246.665,178.41,mm" visibility="1" mode="1" position="246.665,178.41,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" northMode="0" id="" size="47.1065,27.6,mm" pictureRotation="0" pictureHeight="26.6623" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="1" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_500.png" pictureWidth="47.1065" excludeFromExports="0" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25140,7 +23751,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame 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;" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" type="65648" resizeMode="0" maxBreakDistance="10" 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;}" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame 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;" evaluateExpressions="true" templateUuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{be85a831-77bf-46f6-af2f-d521cf3a435a}" resizeMode="0" useSmartBreaks="true" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
         <childFrame templateUuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}" uuid="{5a732a8d-7fbf-4f9f-9bc4-5eec6c8316d2}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -25184,13 +23795,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="false" name="singleFile" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_positions" enabled="1" filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" pageNameExpression="&quot;position&quot;" sortFeatures="1" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="&quot;id&quot;" sortAscending="1" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayerProvider="ogr" hideCoverage="0"/>
+      <Atlas filenamePattern="&quot;csv_day&quot;||'_'||&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" enabled="1" coverageLayerName="marshal_positions" hideCoverage="0" sortKey="&quot;position&quot;" pageNameExpression="&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="300" name="Start &amp; Finish Backgrounds" worldFileMap="" units="mm">
+    <Layout name="Start &amp; Finish Backgrounds" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25198,7 +23809,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}">
+          <layer enabled="1" id="{fb2df141-e8fb-46c6-9530-eb2e048d12f1}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -25221,9 +23832,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -25236,7 +23847,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25244,7 +23855,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}">
+            <layer enabled="1" id="{0b05c78e-869d-453c-b1fe-77568dc401f2}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25270,9 +23881,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="0" pictureWidth="6.31767" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="arrows/NorthArrow_11.svg" anchorPoint="0" groupUuid="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" pictureHeight="7.97477" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" positionLock="true" visibility="1" frame="false" position="286.027,2,mm" positionOnPage="286.027,2,mm" size="9.45865,11,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="330">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="286.027,2,mm" visibility="1" mode="0" position="286.027,2,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" northMode="0" id="" size="9.45865,11,mm" pictureRotation="330" pictureHeight="7.97477" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="0" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" excludeFromExports="0" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25292,9 +23903,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" labelText="[%upper( &quot;area&quot; )%]" valign="64" positionLock="true" visibility="1" frame="false" position="285.027,205.886,mm" positionOnPage="285.027,205.886,mm" marginX="1" size="142.543,10.3185,mm" background="false" id="" halign="1" itemRotation="270" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="285.027,205.886,mm" marginX="1" visibility="1" position="285.027,205.886,mm" itemRotation="270" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" id="" size="142.543,10.3185,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="3" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[%upper( &quot;area&quot; )%]" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25307,12 +23918,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25320,7 +23931,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -25344,7 +23955,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25354,9 +23965,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem segmentSizeMode="1" segmentMillimeters="26.3519" id="" zValue="2" labelHorizontalPlacement="0" unitLabel="m" excludeFromExports="0" height="3" lineJoinStyle="miter" outlineWidth="0.3" opacity="1" position="7,189.669,mm" blendMode="0" unitType="meters" labelVerticalPlacement="0" boxContentSpace="1" maxBarWidth="150" outlineWidthM="0.3,mm" labelBarSpace="3" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" itemRotation="0" referencePoint="0" minBarWidth="50" numUnitsPerSegment="100" numSegmentsLeft="2" style="Single Box" frame="false" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" background="false" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" visibility="1" numMapUnitsPerScaleBarUnit="1" numSegments="4" positionOnPage="7,189.669,mm" size="145.54,16.2165,mm" frameJoinStyle="miter" subdivisionsHeight="1.5" type="65646" lineCapStyle="square" positionLock="true" numSubdivisions="1" alignment="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65646" outlineWidth="0.3" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="7,189.669,mm" alignment="0" minBarWidth="50" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="1" labelBarSpace="3" height="3" numUnitsPerSegment="100" background="false" groupUuid="" segmentMillimeters="26.3519" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="7,189.669,mm" lineJoinStyle="miter" itemRotation="0" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" maxBarWidth="150" outlineWidthM="0.3,mm" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" numSegments="4" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Single Box" size="145.54,16.2165,mm" id="" zValue="2">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25369,12 +23980,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25382,7 +23993,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -25406,7 +24017,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25415,7 +24026,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor blue="0" red="0" green="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -25427,10 +24038,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor blue="0" red="0" green="0" alpha="255"/>
+        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25438,7 +24049,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}">
+            <layer enabled="1" id="{40c19cdc-b5d8-4c29-b495-91831de94e96}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -25479,7 +24090,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25487,7 +24098,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}">
+            <layer enabled="1" id="{e17813c9-0c1f-4de2-b3ce-d4c7516e73aa}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -25528,7 +24139,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25536,7 +24147,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{89036785-f311-478b-b997-5a2119fbdd2c}">
+            <layer enabled="1" id="{89036785-f311-478b-b997-5a2119fbdd2c}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -25577,7 +24188,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25585,7 +24196,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}">
+            <layer enabled="1" id="{a049d407-0bbc-4f51-bf82-0451da5b6f96}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25610,7 +24221,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25618,7 +24229,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{987cde69-791e-42ba-9c64-bbe76719b954}">
+            <layer enabled="1" id="{987cde69-791e-42ba-9c64-bbe76719b954}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25643,9 +24254,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="7,5.5,mm" drawCanvasItems="false" positionOnPage="7,5.5,mm" mapFlags="0" size="278.027,180.318,mm" background="false" id="" itemRotation="0" mapRotation="330" followPresetName="Start/Finish" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="7,5.5,mm" visibility="1" followPreset="true" position="7,5.5,mm" itemRotation="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" size="278.027,180.318,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="330" background="false" excludeFromExports="0" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Start/Finish" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25674,11 +24285,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89880140828828559" ymin="-33.90494830469008747" xmin="18.40843143571575169" xmax="18.41790915398017958"/>
+        <Extent xmax="18.41790915398017958" xmin="18.40843143571575169" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="3" rightAnnotationDisplay="3" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="5" minimumIntervalWidth="50" annotationFormat="4" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="1" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="3" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25686,7 +24297,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}">
+              <layer enabled="1" id="{805cd1c9-6e7c-4edf-9f71-f695bf053dfc}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -25727,7 +24338,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -25735,7 +24346,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}">
+              <layer enabled="1" id="{fc6bfb9b-d7f7-40a7-8461-68af51e0c930}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -25778,12 +24389,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -25791,7 +24402,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -25815,7 +24426,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25837,12 +24448,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -25869,13 +24480,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="0" name="svgTextFormat" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="start_finish_area" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;area&quot;" sortFeatures="1" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" sortAscending="1" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="start_finish_area" hideCoverage="1" sortKey="area" pageNameExpression="&quot;area&quot;" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/start_finish_area.shp" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="300" name="Cones" worldFileMap="" units="mm">
+    <Layout name="Cones" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -25883,7 +24494,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}">
+          <layer enabled="1" id="{3230dbf8-39a4-46b5-aff8-fccf095543a3}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -25906,9 +24517,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -25921,7 +24532,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -25929,7 +24540,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{acff6c17-7d68-4552-8826-25f0be803e5b}">
+            <layer enabled="1" id="{acff6c17-7d68-4552-8826-25f0be803e5b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -25955,9 +24566,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wrapChar="" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="11" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="256.808,5.21277,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="0" symbolAlignment="1" frame="true" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="256.808,5.21277,mm" size="38.1563,67.2879,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,67.2879,mm" id="" symbolHeight="4" zValue="11">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -25974,13 +24585,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -25988,7 +24599,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26012,7 +24623,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26022,13 +24633,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26036,7 +24647,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26060,7 +24671,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26070,13 +24681,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26084,7 +24695,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26108,7 +24719,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26118,13 +24729,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26132,7 +24743,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26156,7 +24767,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26166,13 +24777,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -26180,7 +24791,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -26204,7 +24815,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26219,11 +24830,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" patch_size="0,0" name="fencing" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
@@ -26235,11 +24846,11 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -26253,9 +24864,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="10" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" labelText="CONES: [% &quot;name&quot; %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,191.188,mm" positionOnPage="6.76779,191.188,mm" marginX="0" size="148.46,6.45211,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="CONES: [% &quot;name&quot; %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26268,12 +24879,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26281,7 +24892,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26305,7 +24916,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26315,9 +24926,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="56.3557" type="65647" excludeFromExports="0" zValue="9" referencePoint="0" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" positionLock="true" sectionY="0" visibility="1" frame="false" position="182.723,191.188,mm" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" size="56.3557,6.45237,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionY="0" background="false" excludeFromExports="0" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" sectionHeight="5.76">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26331,9 +24942,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" labelText="REVISION 1.1" valign="32" positionLock="true" visibility="1" frame="false" position="212.257,198.083,mm" positionOnPage="212.257,198.083,mm" marginX="0" size="26.8205,6.82826,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.257,198.083,mm" marginX="0" visibility="1" position="212.257,198.083,mm" itemRotation="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26346,12 +24957,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26359,7 +24970,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26383,7 +24994,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26393,9 +25004,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="6" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" valign="32" positionLock="true" visibility="1" frame="false" position="116.805,198.083,mm" positionOnPage="116.805,198.083,mm" marginX="0" size="64.7594,7.10512,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="116.805,198.083,mm" marginX="0" visibility="1" position="116.805,198.083,mm" itemRotation="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" id="" size="64.7594,7.10512,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="6" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26408,12 +25019,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26421,7 +25032,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26445,7 +25056,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26455,9 +25066,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" labelText="Page [% @atlas_featurenumber %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,198.083,mm" positionOnPage="6.76779,198.083,mm" marginX="0" size="52.7903,7.07327,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" id="" size="52.7903,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26470,12 +25081,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26483,7 +25094,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26507,7 +25118,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26517,9 +25128,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="49.3143" mapUuid="" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" anchorPoint="8" groupUuid="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" pictureHeight="28.0105" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" positionLock="true" visibility="1" frame="false" position="243.098,175.353,mm" positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26539,9 +25150,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" positionLock="true" visibility="1" frame="false" position="6.91779,197.79,mm" positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26554,7 +25165,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26562,7 +25173,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}">
+          <layer enabled="1" id="{adf3a0f0-b453-44e8-a8be-1a49712c981a}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -26586,9 +25197,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem segmentSizeMode="1" segmentMillimeters="30.2878" id="" zValue="2" labelHorizontalPlacement="0" unitLabel="m" excludeFromExports="0" height="2" lineJoinStyle="round" outlineWidth="0.2" opacity="1" position="6.76779,2.8482,mm" blendMode="0" unitType="meters" labelVerticalPlacement="0" boxContentSpace="0.2" maxBarWidth="100" outlineWidthM="0.3,mm" labelBarSpace="1" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" itemRotation="0" referencePoint="0" minBarWidth="25" numUnitsPerSegment="500" numSegmentsLeft="2" style="Double Box" frame="false" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" background="false" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" visibility="1" numMapUnitsPerScaleBarUnit="1" numSegments="2" positionOnPage="6.76779,2.8482,mm" size="104.399,15.8378,mm" frameJoinStyle="miter" subdivisionsHeight="1.5" type="65646" lineCapStyle="square" positionLock="true" numSubdivisions="1" alignment="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="500" background="false" groupUuid="" segmentMillimeters="30.2878" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="104.399,15.8378,mm" id="" zValue="2">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26601,12 +25212,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26614,7 +25225,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -26638,7 +25249,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -26647,7 +25258,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor blue="0" red="0" green="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -26659,10 +25270,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor blue="0" red="0" green="0" alpha="255"/>
+        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26670,7 +25281,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}">
+            <layer enabled="1" id="{b36fa0a9-f24d-47b0-8237-1e717a90809b}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -26711,7 +25322,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26719,7 +25330,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}">
+            <layer enabled="1" id="{54d1ad89-972c-43dd-a506-e9c54579e9b8}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -26760,7 +25371,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26768,7 +25379,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}">
+            <layer enabled="1" id="{1f3874ac-6c08-4c55-861c-d829891d3b01}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -26809,7 +25420,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26817,7 +25428,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ae895973-56d3-4fc1-86c6-c98493abf339}">
+            <layer enabled="1" id="{ae895973-56d3-4fc1-86c6-c98493abf339}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -26842,7 +25453,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -26850,7 +25461,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c0c92035-0ffd-446d-b579-16536dd36b75}">
+            <layer enabled="1" id="{c0c92035-0ffd-446d-b579-16536dd36b75}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -26875,9 +25486,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="6.76779,9.35102,mm" drawCanvasItems="false" positionOnPage="6.76779,9.35102,mm" mapFlags="0" size="283.418,180.92,mm" background="false" id="" itemRotation="0" mapRotation="0" followPresetName="Fencing" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -26912,7 +25523,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92282769675948373" ymin="-33.94965747213089458" xmin="18.35799642373368457" xmax="18.4000263443481451"/>
+        <Extent xmax="18.4000263443481451" xmin="18.35799642373368457" ymax="-33.92282769675948373" ymin="-33.94965747213089458"/>
         <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>
@@ -26927,9 +25538,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="3" rightAnnotationDisplay="3" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="5" minimumIntervalWidth="50" annotationFormat="4" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="1" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="3" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26937,7 +25548,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{e73cb565-3046-4259-89ee-05f5d6c61953}">
+              <layer enabled="1" id="{e73cb565-3046-4259-89ee-05f5d6c61953}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -26978,7 +25589,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -26986,7 +25597,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}">
+              <layer enabled="1" id="{43cf7947-2877-4eed-a74a-c2aa8c98e051}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -27029,12 +25640,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -27042,7 +25653,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -27066,7 +25677,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -27088,14 +25699,14 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{a9f0a135-9817-45e9-84e4-99677487e931}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{a9f0a135-9817-45e9-84e4-99677487e931}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}" uuid="{baf2d80a-6398-40e3-8b6b-75b70815da51}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -27135,13 +25746,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="cone_groups" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortKey="&quot;group&quot;" sortAscending="1" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len]%20FROM%20fencing%20WHERE%20%22type%22%20NOT%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="cone_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="cone_only_groups_565d363b_6bc2_4d54_bff4_5ae60d8ed84a" sortFeatures="1" 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" filterFeatures="0" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout printResolution="144" name="Ask Me" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm">
+    <Layout name="Ask Me" units="mm" printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="9"/>
+      <Grid offsetX="0" resUnits="mm" resolution="9" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27149,7 +25760,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{20578607-b7b1-4298-b229-e8f94e47157a}">
+          <layer enabled="1" id="{20578607-b7b1-4298-b229-e8f94e47157a}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -27172,9 +25783,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -27187,7 +25798,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -27195,7 +25806,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}">
+            <layer enabled="1" id="{ad46d227-3ddb-49aa-a3f1-69f7e3884a27}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -27220,12 +25831,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" labelText="Directions to Start of Race" valign="64" positionLock="false" visibility="1" frame="false" position="4.43449,186.634,mm" positionOnPage="4.43449,186.634,mm" marginX="1" size="83.9998,10.4638,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.43449,186.634,mm" marginX="1" visibility="1" position="4.43449,186.634,mm" itemRotation="0" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" id="" size="83.9998,10.4638,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Directions to Start of Race" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27238,12 +25849,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27251,7 +25862,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27275,7 +25886,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27285,9 +25896,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" labelText="Gun Run" valign="32" positionLock="false" visibility="1" frame="false" position="4.43449,197.498,mm" positionOnPage="4.43449,197.498,mm" marginX="1" size="48.2923,9.511,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.43449,197.498,mm" marginX="1" visibility="1" position="4.43449,197.498,mm" itemRotation="0" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" id="" size="48.2923,9.511,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Gun Run" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27300,12 +25911,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27313,7 +25924,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27337,7 +25948,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27347,9 +25958,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wrapChar="" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="6" symbolWidth="9" wmsLegendWidth="50" symbolHeight="5" excludeFromExports="0" opacity="1" position="10.096,10.8563,mm" columnSpace="0" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="true" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="10.096,10.8563,mm" size="59.0766,76,mm" columnCount="1" titleAlignment="1" frameJoinStyle="round" type="65642" equalColumnWidth="0" legendFilterByMap="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="false" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="139" green="139" red="139" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="10.096,10.8563,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="9" rasterBorderWidth="0" boxSpace="2" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" legendFilterByMap="1" resizeToContents="1" referencePoint="0" frameJoinStyle="round" positionOnPage="10.096,10.8563,mm" minSymbolSize="0" itemRotation="0" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="0" positionLock="false" size="59.0766,76,mm" id="" symbolHeight="5" zValue="6">
+        <FrameColor blue="139" red="139" green="139" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27366,13 +25977,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="7.6444479999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="16" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="7.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27380,7 +25991,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27404,7 +26015,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27414,13 +26025,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27428,7 +26039,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27452,7 +26063,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27462,13 +26073,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27476,7 +26087,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27500,7 +26111,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27510,13 +26121,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27524,7 +26135,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27548,7 +26159,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27558,13 +26169,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbolLabel" alignment="1" marginLeft="3">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="3" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -27572,7 +26183,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -27596,7 +26207,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27611,13 +26222,13 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Ask Me" expanded="1" checked="Qt::Checked" groupLayer="">
+          <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>
             </customproperties>
-            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" patch_size="0,0" name="poi_labels" expanded="1" legend_split_behavior="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" legend_exp="" name="poi_labels" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="Start/Finish" name="legend/label-0" type="QString"/>
@@ -27630,7 +26241,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" patch_size="0,0" name="directions_to_start" expanded="1" legend_split_behavior="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" legend_exp="" name="directions_to_start" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="To 21KM Start (06:30)" name="legend/label-0" type="QString"/>
@@ -27644,9 +26255,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" labelText="REVISION 1.0" valign="32" positionLock="false" visibility="1" frame="false" position="221.862,190.027,mm" positionOnPage="221.862,190.027,mm" marginX="1" size="27.7839,6.871,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="221.862,190.027,mm" marginX="1" visibility="1" position="221.862,190.027,mm" itemRotation="0" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" id="" size="27.7839,6.871,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27659,12 +26270,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27672,7 +26283,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27696,7 +26307,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27706,9 +26317,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="4" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" labelText="Sunday, 20 October 2019" valign="64" positionLock="false" visibility="1" frame="false" position="197.975,197.498,mm" positionOnPage="197.975,197.498,mm" marginX="1" size="51.6706,6.60801,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="197.975,197.498,mm" marginX="1" visibility="1" position="197.975,197.498,mm" itemRotation="0" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" opacity="1" positionLock="false" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27721,12 +26332,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27734,7 +26345,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -27758,7 +26369,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27768,9 +26379,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="24.2337" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" type="65640" excludeFromExports="0" zValue="3" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="4" groupUuid="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" pictureHeight="24.3824" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" positionLock="false" visibility="1" frame="false" position="249.646,179.724,mm" positionOnPage="249.646,179.724,mm" size="42.9838,24.3824,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="249.646,179.724,mm" visibility="1" mode="1" position="249.646,179.724,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" northMode="0" id="" size="42.9838,24.3824,mm" pictureRotation="0" pictureHeight="24.3824" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="24.2337" excludeFromExports="0" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" opacity="1" positionLock="false" type="65640" groupUuid="" northOffset="0" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27790,9 +26401,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="2" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" positionLock="false" visibility="1" frame="false" position="4.58449,197.248,mm" positionOnPage="4.58449,197.248,mm" size="244.912,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="4.58449,197.248,mm" shapeType="1" visibility="1" position="4.58449,197.248,mm" itemRotation="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" id="" size="244.912,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="false" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27805,7 +26416,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -27813,7 +26424,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{25dc84af-8724-465b-a42c-c6c013132998}">
+          <layer enabled="1" id="{25dc84af-8724-465b-a42c-c6c013132998}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -27837,9 +26448,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" isTemporal="0" followPreset="true" positionLock="false" visibility="1" frame="false" position="4.43449,6.411,mm" drawCanvasItems="false" positionOnPage="4.43449,6.411,mm" mapFlags="0" size="288.007,183.616,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Ask Me" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="4.43449,6.411,mm" visibility="1" followPreset="true" position="4.43449,6.411,mm" itemRotation="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" size="288.007,183.616,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Ask Me" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -27868,7 +26479,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8970204297764468" ymin="-33.90994364588821952" xmin="18.39762336729721071" xmax="18.41789384089274151"/>
+        <Extent xmax="18.41789384089274151" xmin="18.39762336729721071" ymax="-33.8970204297764468" ymin="-33.90994364588821952"/>
         <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>
@@ -27883,9 +26494,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27893,7 +26504,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}">
+              <layer enabled="1" id="{f9d4239c-edd1-4e84-941b-c2fc074d73c4}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -27934,7 +26545,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -27942,7 +26553,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}">
+              <layer enabled="1" id="{9a9b30cd-2f69-4b13-b8ac-a145ad5dc439}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -27974,12 +26585,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -27987,7 +26598,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -28011,7 +26622,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28033,12 +26644,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -28056,13 +26667,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" sortFeatures="0" coverageLayer="" filterFeatures="0" hideCoverage="0"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" enabled="0" hideCoverage="0" pageNameExpression="" coverageLayer="" sortFeatures="0" filterFeatures="0"/>
     </Layout>
-    <Layout printResolution="144" name="Routes" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" units="mm">
+    <Layout name="Routes" units="mm" printResolution="144" worldFileMap="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28070,7 +26681,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}">
+          <layer enabled="1" id="{a60599ee-9ff6-4a20-80d3-bc85c37739a7}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -28093,9 +26704,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28108,7 +26719,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28116,7 +26727,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}">
+            <layer enabled="1" id="{3ae1ee91-846b-4808-ae90-8cd4a915de1b}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -28141,12 +26752,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="13" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" labelText="REVISION 1.7" valign="32" positionLock="true" visibility="1" frame="false" position="200.171,199.082,mm" positionOnPage="200.171,199.082,mm" marginX="0" size="61.5373,6.8714,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="200.171,199.082,mm" marginX="0" visibility="1" position="200.171,199.082,mm" itemRotation="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" id="" size="61.5373,6.8714,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="13" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.7" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28159,12 +26770,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28172,7 +26783,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -28196,7 +26807,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28206,9 +26817,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="12" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" labelText="Gun Run 2023: [%&quot;Source&quot;%]" valign="64" positionLock="true" visibility="1" frame="false" position="9.7863,192.073,mm" positionOnPage="9.7863,192.073,mm" marginX="0" size="61.5373,6.60801,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.7863,192.073,mm" marginX="0" visibility="1" position="9.7863,192.073,mm" itemRotation="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" id="" size="61.5373,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="12" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Gun Run 2023: [%&quot;Source&quot;%]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28221,12 +26832,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28234,7 +26845,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -28258,7 +26869,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28268,9 +26879,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="11" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" valign="32" positionLock="true" visibility="1" frame="false" position="9.7863,199.082,mm" positionOnPage="9.7863,199.082,mm" marginX="0" size="61.5373,6.60801,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.7863,199.082,mm" marginX="0" visibility="1" position="9.7863,199.082,mm" itemRotation="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" id="" size="61.5373,6.60801,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="11" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5KM|10|Trail)' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28283,12 +26894,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28296,7 +26907,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -28320,7 +26931,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28330,9 +26941,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="29.7523" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" type="65640" excludeFromExports="0" zValue="10" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" anchorPoint="4" groupUuid="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" pictureHeight="16.8993" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" positionLock="true" visibility="1" frame="false" position="262.196,188.218,mm" positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="16.8993" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="10" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="29.7523" excludeFromExports="0" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28352,9 +26963,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="9" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" positionLock="true" visibility="1" frame="false" position="9.57644,198.832,mm" positionOnPage="9.57644,198.832,mm" size="251.982,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.57644,198.832,mm" shapeType="1" visibility="1" position="9.57644,198.832,mm" itemRotation="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" id="" size="251.982,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="9" frame="false" background="false" excludeFromExports="0" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28367,7 +26978,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28375,7 +26986,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{04656074-3faa-4640-ae80-a44a8cb036f7}">
+          <layer enabled="1" id="{04656074-3faa-4640-ae80-a44a8cb036f7}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -28399,9 +27010,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="8" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="8.21644,4.09761,mm" drawCanvasItems="true" positionOnPage="8.21644,4.09761,mm" mapFlags="0" size="109.221,188.689,mm" background="true" id="Trail Finish" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.21644,4.09761,mm" visibility="1" followPreset="true" position="8.21644,4.09761,mm" itemRotation="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" size="109.221,188.689,mm" frameJoinStyle="miter" blendMode="0" zValue="8" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28420,18 +27031,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90007966676468953" ymin="-33.93242806047424409" xmin="18.39314911415855391" xmax="18.41187375074135701"/>
+        <Extent xmax="18.41187375074135701" xmin="18.39314911415855391" ymax="-33.90007966676468953" ymin="-33.93242806047424409"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="7" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="113.002,2.39423,mm" drawCanvasItems="true" positionOnPage="113.002,2.39423,mm" mapFlags="0" size="179.156,191.505,mm" background="true" id="Trail Start" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="113.002,2.39423,mm" visibility="1" followPreset="true" position="113.002,2.39423,mm" itemRotation="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" size="179.156,191.505,mm" frameJoinStyle="miter" blendMode="0" zValue="7" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28450,18 +27061,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.92465573363980269" ymin="-33.95791657202656921" xmin="18.3924263991010406" xmax="18.42354248737832023"/>
+        <Extent xmax="18.42354248737832023" xmin="18.3924263991010406" ymax="-33.92465573363980269" ymin="-33.95791657202656921"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="6" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="5.86559,4.09761,mm" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" mapFlags="0" size="67.7828,166.874,mm" background="true" id="Left inset 21KM" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="6" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28505,18 +27116,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91681492292400435" ymin="-33.94700000000000273" xmin="18.37399999999999878" xmax="18.38626092146919788"/>
+        <Extent xmax="18.38626092146919788" xmin="18.37399999999999878" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="5" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="131.391,120.702,mm" drawCanvasItems="true" positionOnPage="131.391,120.702,mm" mapFlags="0" size="113.3,76.1023,mm" background="true" id="Bottom inset 21KM" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="144" green="34" red="103" alpha="255"/>
-        <BackgroundColor blue="215" green="175" red="200" alpha="128"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="131.391,120.702,mm" visibility="1" followPreset="true" position="131.391,120.702,mm" itemRotation="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" size="113.3,76.1023,mm" frameJoinStyle="miter" blendMode="0" zValue="5" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="144" red="103" green="34" alpha="255"/>
+        <BackgroundColor blue="215" red="200" green="175" alpha="128"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28535,18 +27146,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91132718340826813" ymin="-33.9168317482614512" xmin="18.41509620662891678" xmax="18.42329132157224336"/>
+        <Extent xmax="18.42329132157224336" xmin="18.41509620662891678" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
         <LayerSet/>
-        <AtlasMap scalingMode="0" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings enabled="0" clippingType="1" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.15,mm" groupUuid="" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="8.14144,4.02261,mm" drawCanvasItems="true" positionOnPage="8.14144,4.02261,mm" mapFlags="0" size="282.732,188.839,mm" background="true" id="Main Map" itemRotation="0" mapRotation="0" followPresetName="Routes" blendMode="0" frameJoinStyle="round" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="8.14144,4.02261,mm" visibility="1" followPreset="true" position="8.14144,4.02261,mm" itemRotation="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" size="282.732,188.839,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="true" followPresetName="Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28575,11 +27186,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.8918539481981469" ymin="-33.92600000000000193" xmin="18.37199999999999989" xmax="18.42312398088981951"/>
+        <Extent xmax="18.42312398088981951" xmin="18.37199999999999989" ymax="-33.8918539481981469" ymin="-33.92600000000000193"/>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28587,7 +27198,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}">
+              <layer enabled="1" id="{c1c3f42f-9054-4294-be5b-1f866f3e0a9c}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -28628,7 +27239,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28636,7 +27247,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}">
+              <layer enabled="1" id="{53251229-a00c-4ec1-9df9-51bea540c4e3}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -28668,12 +27279,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -28681,7 +27292,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -28705,7 +27316,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28727,8 +27338,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview name="Overview 1" show="1" position="3" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" inverted="0" centered="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}">
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" name="Overview 1" show="1" blendMode="0" centered="1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" inverted="0">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28742,7 +27353,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}">
+            <layer enabled="1" id="{c70687b6-ebcb-4a4f-9196-528667fd884e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -28778,12 +27389,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapOverview>
-        <AtlasMap scalingMode="2" margin="0.06" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.06" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -28808,13 +27419,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" coverageLayerName="all_routes" enabled="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" pageNameExpression="&quot;Distance&quot;" sortFeatures="1" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortKey="&quot;Sort&quot;" sortAscending="1" filterFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayerProvider="ogr" hideCoverage="0"/>
+      <Atlas filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" enabled="1" coverageLayerName="all_routes" hideCoverage="0" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" pageNameExpression="&quot;Distance&quot;" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" filterFeatures="1" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="120" name="Marshal Plan A1" worldFileMap="" units="mm">
+    <Layout name="Marshal Plan A1" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -28822,7 +27433,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{65fd4b73-0525-4952-b52a-060921d10d24}">
+          <layer enabled="1" id="{65fd4b73-0525-4952-b52a-060921d10d24}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -28845,9 +27456,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="594,841,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" size="594,841,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28860,7 +27471,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -28868,7 +27479,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{ca38df31-0d5f-4457-be79-18d8add56004}">
+            <layer enabled="1" id="{ca38df31-0d5f-4457-be79-18d8add56004}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -28894,9 +27505,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wrapChar="" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="8" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="25.5925,18.7971,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="false" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="25.5925,18.7971,mm" size="4,4,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="25.5925,18.7971,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="25.5925,18.7971,mm" minSymbolSize="0" itemRotation="0" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="4,4,mm" id="" symbolHeight="4" zValue="8">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28913,13 +27524,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.6444479999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="16" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -28927,7 +27538,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -28951,7 +27562,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -28961,13 +27572,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -28975,7 +27586,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -28999,7 +27610,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29009,13 +27620,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="1" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="1">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29023,7 +27634,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29047,7 +27658,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29057,13 +27668,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29071,7 +27682,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29095,7 +27706,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29105,13 +27716,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29119,7 +27730,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29143,7 +27754,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29158,11 +27769,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes20170907054841602" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes20170907054841602" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" checked="Qt::Checked">
               <customproperties>
                 <Option type="Map">
                   <Option value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" name="expandedLegendNodes" type="QString"/>
@@ -29176,9 +27787,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" labelText="MARSHAL POSITIONS" valign="64" positionLock="true" visibility="1" frame="false" position="5.2963,808.939,mm" positionOnPage="5.2963,808.939,mm" marginX="1" size="91.9494,15.0649,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.2963,808.939,mm" marginX="1" visibility="1" position="5.2963,808.939,mm" itemRotation="0" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" id="" size="91.9494,15.0649,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29191,12 +27802,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29204,7 +27815,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29228,7 +27839,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29238,9 +27849,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" labelText="REVISION 1.2" valign="32" positionLock="true" visibility="1" frame="false" position="430.403,825.052,mm" positionOnPage="430.403,825.052,mm" marginX="1" size="56.6212,15.3656,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="430.403,825.052,mm" marginX="1" visibility="1" position="430.403,825.052,mm" itemRotation="0" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" id="" size="56.6212,15.3656,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.2" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29253,12 +27864,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29266,7 +27877,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29290,7 +27901,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29300,9 +27911,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="4" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" labelText="Sunday, 20 October 2019" valign="64" positionLock="true" visibility="1" frame="false" position="372.175,808.942,mm" positionOnPage="372.175,808.942,mm" marginX="1" size="114.848,15.0635,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="372.175,808.942,mm" marginX="1" visibility="1" position="372.175,808.942,mm" itemRotation="0" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" id="" size="114.848,15.0635,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="4" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{d177957c-7ab6-40ae-8769-347428500538}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29315,12 +27926,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29328,7 +27939,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29352,7 +27963,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29362,9 +27973,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="63.5856" mapUuid="" type="65640" excludeFromExports="0" zValue="3" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="8" groupUuid="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" pictureHeight="63.9757" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" positionLock="true" visibility="1" frame="false" position="489.557,775.395,mm" positionOnPage="489.557,775.395,mm" size="100.498,63.9757,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="489.557,775.395,mm" visibility="1" mode="1" position="489.557,775.395,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" northMode="0" id="" size="100.498,63.9757,mm" pictureRotation="0" pictureHeight="63.9757" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="63.5856" excludeFromExports="0" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29384,9 +27995,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="2" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" positionLock="true" visibility="1" frame="false" position="5.4463,824.155,mm" positionOnPage="5.4463,824.155,mm" size="481.428,0.606138,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.4463,824.155,mm" shapeType="1" visibility="1" position="5.4463,824.155,mm" itemRotation="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" id="" size="481.428,0.606138,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29399,7 +28010,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29407,7 +28018,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}">
+          <layer enabled="1" id="{06cb03ac-e1d9-4376-88e2-c53b09f3b4bc}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -29431,9 +28042,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="3.94474,5.25965,mm" drawCanvasItems="false" positionOnPage="3.94474,5.25965,mm" mapFlags="0" size="584.759,811.213,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Marshal plan" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="3.94474,5.25965,mm" visibility="1" followPreset="true" position="3.94474,5.25965,mm" itemRotation="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" size="584.759,811.213,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29462,14 +28073,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89072661913806428" ymin="-33.95821655848814657" xmin="18.37434415142052657" xmax="18.42299397558693741"/>
+        <Extent xmax="18.42299397558693741" xmin="18.37434415142052657" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -29480,13 +28091,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="0" name="pdfTextFormat" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="complete_marshal_overview" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" sortAscending="1" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayerProvider="virtual" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="complete_marshal_overview" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" filterFeatures="0" coverageLayerProvider="virtual"/>
     </Layout>
-    <Layout printResolution="144" name="Access Roads" worldFileMap="" units="mm">
+    <Layout name="Access Roads" units="mm" printResolution="144" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29494,7 +28105,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}">
+          <layer enabled="1" id="{3b83dbaa-180e-4ce5-a44f-cb99c77ced3e}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -29517,9 +28128,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -29532,7 +28143,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -29540,7 +28151,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{038e2492-f412-42ba-8703-4c8f318a87c2}">
+            <layer enabled="1" id="{038e2492-f412-42ba-8703-4c8f318a87c2}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -29565,12 +28176,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem wrapChar="" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="15" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="244.484,130.172,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="true" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="244.484,130.172,mm" size="34.45,40.8,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="0" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="185"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="244.484,130.172,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" equalColumnWidth="0" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="244.484,130.172,mm" minSymbolSize="0" itemRotation="0" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="34.45,40.8,mm" id="" symbolHeight="4" zValue="15">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="185"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29584,13 +28195,13 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29598,7 +28209,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29622,7 +28233,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29632,13 +28243,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29646,7 +28257,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29670,7 +28281,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29680,13 +28291,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29694,7 +28305,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29718,7 +28329,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29728,13 +28339,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29742,7 +28353,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29766,7 +28377,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29776,13 +28387,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -29790,7 +28401,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -29814,7 +28425,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29829,11 +28440,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Residents Access" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Residents Access" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" patch_size="0,0" name="residents_access_roads" expanded="1" legend_split_behavior="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" legend_exp="" name="residents_access_roads" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -29845,9 +28456,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" labelText="ACCESS ROUTES FOR RESIDENTS" valign="64" positionLock="true" visibility="1" frame="false" position="9.37446,191.81,mm" positionOnPage="9.37446,191.81,mm" marginX="0" size="194.851,7.272,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="ACCESS ROUTES FOR RESIDENTS" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29860,12 +28471,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29873,7 +28484,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29897,7 +28508,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29907,9 +28518,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="6" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" labelText="REVISION 1.1" valign="64" positionLock="true" visibility="1" frame="false" position="204.225,191.81,mm" positionOnPage="204.225,191.81,mm" marginX="1" size="57.4836,6.8714,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29922,12 +28533,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29935,7 +28546,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -29959,7 +28570,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -29969,9 +28580,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" labelText="Sunday, 20 October 2019" valign="64" positionLock="true" visibility="1" frame="false" position="210.038,199.082,mm" positionOnPage="210.038,199.082,mm" marginX="1" size="51.6706,6.60801,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29984,12 +28595,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -29997,7 +28608,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30021,7 +28632,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30031,9 +28642,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="17.3653" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="4" groupUuid="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" pictureHeight="17.4718" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" positionLock="true" visibility="1" frame="false" position="262.196,188.218,mm" positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30053,9 +28664,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" positionLock="true" visibility="1" frame="false" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30068,7 +28679,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30076,7 +28687,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}">
+          <layer enabled="1" id="{5ba70802-6163-45fd-99da-6e7d106e21ac}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -30100,9 +28711,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="2" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="5.86559,4.09761,mm" drawCanvasItems="false" positionOnPage="5.86559,4.09761,mm" mapFlags="0" size="67.7828,166.874,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Access Routes" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.86559,4.09761,mm" visibility="1" followPreset="true" position="5.86559,4.09761,mm" itemRotation="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" size="67.7828,166.874,mm" frameJoinStyle="miter" blendMode="0" zValue="2" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30146,7 +28757,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.91513741583252539" ymin="-33.94652930000000168" xmin="18.37288570000000121" xmax="18.38563681624126289"/>
+        <Extent xmax="18.38563681624126289" xmin="18.37288570000000121" ymax="-33.91513741583252539" ymin="-33.94652930000000168"/>
         <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>
@@ -30161,9 +28772,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30171,7 +28782,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}">
+              <layer enabled="1" id="{836aeb8b-5a39-4b51-baf9-050f984bf6fe}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -30212,7 +28823,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30220,7 +28831,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}">
+              <layer enabled="1" id="{0eb35e70-6c69-4781-9e9b-d3ede121623b}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -30252,12 +28863,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -30265,7 +28876,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -30289,7 +28900,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -30311,16 +28922,16 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.05" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.05" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.15,mm" groupUuid="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="true" position="9.44946,9.08557,mm" drawCanvasItems="false" positionOnPage="9.44946,9.08557,mm" mapFlags="0" size="282.012,175.592,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Access Routes" blendMode="0" frameJoinStyle="round" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,9.08557,mm" visibility="1" followPreset="true" position="9.44946,9.08557,mm" itemRotation="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" size="282.012,175.592,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="true" mapRotation="0" background="true" excludeFromExports="0" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Access Routes" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30349,7 +28960,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89697816224119009" ymin="-33.92999999999999972" xmin="18.37000000000000099" xmax="18.42303507276415431"/>
+        <Extent xmax="18.42303507276415431" xmin="18.37000000000000099" ymax="-33.89697816224119009" ymin="-33.92999999999999972"/>
         <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>
@@ -30364,9 +28975,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30374,7 +28985,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ebfdf781-190f-4651-9709-789cb68c9533}">
+              <layer enabled="1" id="{ebfdf781-190f-4651-9709-789cb68c9533}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -30415,7 +29026,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30423,7 +29034,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}">
+              <layer enabled="1" id="{5d9e339b-e130-45b6-8ade-2d138a5fc9d3}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -30455,12 +29066,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -30468,7 +29079,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -30492,7 +29103,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -30514,12 +29125,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -30537,13 +29148,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="false" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" enabled="1" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="1" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="144" name="Golf Course Access" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm">
+    <Layout name="Golf Course Access" units="mm" printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30551,7 +29162,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c6a999b7-046a-4375-b775-24bfc19b454c}">
+          <layer enabled="1" id="{c6a999b7-046a-4375-b775-24bfc19b454c}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -30574,9 +29185,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -30589,7 +29200,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -30597,7 +29208,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{cef79093-d3c5-4edf-9190-66f460844f01}">
+            <layer enabled="1" id="{cef79093-d3c5-4edf-9190-66f460844f01}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -30622,12 +29233,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide page="0" orientation="2" position="0" units="mm"/>
+          <Guide orientation="2" units="mm" position="0" page="0"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" labelText="Access to P9 Parking and VIP Tent" valign="64" positionLock="true" visibility="1" frame="false" position="9.37446,191.81,mm" positionOnPage="9.37446,191.81,mm" marginX="0" size="194.851,7.272,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.37446,191.81,mm" marginX="0" visibility="1" position="9.37446,191.81,mm" itemRotation="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" id="" size="194.851,7.272,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="8" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Access to P9 Parking and VIP Tent" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30640,12 +29251,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30653,7 +29264,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30677,7 +29288,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30687,9 +29298,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="6" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" labelText="REVISION 1.0" valign="64" positionLock="true" visibility="1" frame="false" position="204.225,191.81,mm" positionOnPage="204.225,191.81,mm" marginX="1" size="57.4836,6.8714,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="204.225,191.81,mm" marginX="1" visibility="1" position="204.225,191.81,mm" itemRotation="0" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" id="" size="57.4836,6.8714,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="6" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.0" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30702,12 +29313,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30715,7 +29326,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30739,7 +29350,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30749,9 +29360,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" labelText="Sunday, 20 October 2019" valign="64" positionLock="true" visibility="1" frame="false" position="210.038,199.082,mm" positionOnPage="210.038,199.082,mm" marginX="1" size="51.6706,6.60801,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="210.038,199.082,mm" marginX="1" visibility="1" position="210.038,199.082,mm" itemRotation="0" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" id="" size="51.6706,6.60801,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="5" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Sunday, 20 October 2019" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30764,12 +29375,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30777,7 +29388,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -30801,7 +29412,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30811,9 +29422,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="17.3653" mapUuid="" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../Gun_Run_Logo.png" anchorPoint="4" groupUuid="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" pictureHeight="17.4718" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" positionLock="true" visibility="1" frame="false" position="262.196,188.218,mm" positionOnPage="262.196,188.218,mm" size="29.7523,17.4718,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="262.196,188.218,mm" visibility="1" mode="1" position="262.196,188.218,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" northMode="0" id="" size="29.7523,17.4718,mm" pictureRotation="0" pictureHeight="17.4718" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="4" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../Gun_Run_Logo.png" pictureWidth="17.3653" excludeFromExports="0" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30833,9 +29444,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" positionLock="true" visibility="1" frame="false" position="9.59946,198.832,mm" positionOnPage="9.59946,198.832,mm" size="251.959,0.1,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="9.59946,198.832,mm" shapeType="1" visibility="1" position="9.59946,198.832,mm" itemRotation="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" id="" size="251.959,0.1,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30848,7 +29459,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -30856,7 +29467,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{025604c1-b118-4f15-b140-54c9145260c4}">
+          <layer enabled="1" id="{025604c1-b118-4f15-b140-54c9145260c4}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -30880,9 +29491,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.15,mm" groupUuid="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" isTemporal="0" followPreset="false" positionLock="false" visibility="1" frame="false" position="9.44946,7.25098,mm" drawCanvasItems="false" positionOnPage="9.44946,7.25098,mm" mapFlags="0" size="282.012,182.649,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="" blendMode="0" frameJoinStyle="round" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.15,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="9.44946,7.25098,mm" visibility="1" followPreset="false" position="9.44946,7.25098,mm" itemRotation="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" size="282.012,182.649,mm" frameJoinStyle="round" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" opacity="1" positionLock="false" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30911,7 +29522,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.90319854486631357" ymin="-33.90848231674397084" xmin="18.40103928699269886" xmax="18.40919746780259914"/>
+        <Extent xmax="18.40919746780259914" xmin="18.40103928699269886" ymax="-33.90319854486631357" ymin="-33.90848231674397084"/>
         <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>
@@ -30926,9 +29537,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="0" rightAnnotationDisplay="0" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="0" minimumIntervalWidth="50" annotationFormat="0" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" intervalX="0" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="0" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="0" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="0" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="0" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="0" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="0" offsetY="0" topAnnotationPosition="1" intervalX="0" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="0" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="0" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="0" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30936,7 +29547,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}">
+              <layer enabled="1" id="{260fd874-7bf9-43a4-af33-127e7baa77e4}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -30977,7 +29588,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -30985,7 +29596,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}">
+              <layer enabled="1" id="{719ee7ed-cd1e-4fe0-b1bb-c4c9a48de0e0}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -31017,12 +29628,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -31030,7 +29641,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -31054,7 +29665,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -31076,12 +29687,12 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.10000000000000001" atlasDriven="0"/>
+        <AtlasMap atlasDriven="0" margin="0.10000000000000001" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -31099,13 +29710,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="false" name="singleFile" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="residents_access" enabled="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" sortFeatures="0" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" enabled="0" coverageLayerName="residents_access" hideCoverage="1" pageNameExpression="&quot;FID&quot;" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="120" name="Marshal Plan" worldFileMap="" units="mm">
+    <Layout name="Marshal Plan" units="mm" printResolution="120" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31113,7 +29724,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}">
+          <layer enabled="1" id="{5e09fe22-d856-4ba8-8cf5-c3fd7e22b304}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -31136,9 +29747,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,420,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" size="297,420,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31151,7 +29762,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -31159,7 +29770,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}">
+            <layer enabled="1" id="{c29f549e-9e76-462f-a0fb-b0827382e76d}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -31185,9 +29796,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem opacity="1" sectionWidth="23.5967" type="65647" excludeFromExports="0" zValue="9" referencePoint="0" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" positionLock="true" sectionY="0" visibility="1" frame="false" position="112.086,406.476,mm" positionOnPage="112.086,406.476,mm" sectionHeight="8.3142" size="23.5967,8.3142,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="112.086,406.476,mm" visibility="1" position="112.086,406.476,mm" itemRotation="0" templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" id="" size="23.5967,8.3142,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="23.5967" frame="false" multiFrame="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionY="0" background="false" excludeFromExports="0" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" sectionHeight="8.3142">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31201,9 +29812,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" labelText="REVISION 1.8" valign="32" positionLock="true" visibility="1" frame="false" position="214.292,406.874,mm" positionOnPage="214.292,406.874,mm" marginX="0" size="27.7839,7.51682,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="214.292,406.874,mm" marginX="0" visibility="1" position="214.292,406.874,mm" itemRotation="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" id="" size="27.7839,7.51682,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.8" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31216,12 +29827,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31229,7 +29840,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -31253,7 +29864,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31263,9 +29874,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" labelText="MARSHAL POSITIONS" valign="64" positionLock="true" visibility="1" frame="false" position="5.69321,398.344,mm" positionOnPage="5.69321,398.344,mm" marginX="0" size="45.1194,8.13137,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.69321,398.344,mm" marginX="0" visibility="1" position="5.69321,398.344,mm" itemRotation="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" id="" size="45.1194,8.13137,mm" valign="64" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="MARSHAL POSITIONS" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31278,12 +29889,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31291,7 +29902,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -31315,7 +29926,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31325,9 +29936,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem wrapChar="" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="6" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="15.6525,12.5708,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="1" symbolAlignment="1" frame="false" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="15.6525,12.5708,mm" size="21.8263,33.2917,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="15.6525,12.5708,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="false" symbolAlignment="1" resizeToContents="1" referencePoint="0" frameJoinStyle="miter" positionOnPage="15.6525,12.5708,mm" minSymbolSize="0" itemRotation="0" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="21.8263,33.2917,mm" id="" symbolHeight="4" zValue="6">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31344,13 +29955,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{8ff439cd-f9a2-4318-a778-a55335437202}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="6.6444479999999997" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="16" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="16" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="6.6444479999999997" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31358,7 +29969,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31382,7 +29993,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31392,13 +30003,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.9388920000000001" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="14" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="14" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.9388920000000001" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31406,7 +30017,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31430,7 +30041,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31440,13 +30051,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="1" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="1">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31454,7 +30065,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31478,7 +30089,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31488,13 +30099,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31502,7 +30113,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31526,7 +30137,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31536,13 +30147,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31550,7 +30161,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31574,7 +30185,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31589,13 +30200,13 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <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>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -31609,9 +30220,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="118.192" type="65647" excludeFromExports="0" zValue="5" referencePoint="0" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" positionLock="true" sectionY="0" visibility="1" frame="false" position="5.69321,406.988,mm" positionOnPage="5.69321,406.988,mm" sectionHeight="7.80192" size="118.192,7.80192,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="5.69321,406.988,mm" visibility="1" position="5.69321,406.988,mm" itemRotation="0" templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" id="" size="118.192,7.80192,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="5" sectionWidth="118.192" frame="false" multiFrame="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionY="0" background="false" excludeFromExports="0" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" sectionHeight="7.80192">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31625,9 +30236,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="93.5757" type="65647" excludeFromExports="0" zValue="4" referencePoint="0" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" positionLock="true" sectionY="0" visibility="1" frame="false" position="148.501,398.344,mm" positionOnPage="148.501,398.344,mm" sectionHeight="8.13167" size="93.5757,8.13167,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="148.501,398.344,mm" visibility="1" position="148.501,398.344,mm" itemRotation="0" templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" id="" size="93.5757,8.13167,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="4" sectionWidth="93.5757" frame="false" multiFrame="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionY="0" background="false" excludeFromExports="0" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" sectionHeight="8.13167">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31641,9 +30252,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="49.3143" mapUuid="" type="65640" excludeFromExports="0" zValue="3" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../../Gun Run 2023.png" anchorPoint="8" groupUuid="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" pictureHeight="27.9119" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" positionLock="true" visibility="1" frame="false" position="243.319,382.696,mm" positionOnPage="243.319,382.696,mm" size="49.3143,31.2967,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.319,382.696,mm" visibility="1" mode="1" position="243.319,382.696,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" northMode="0" id="" size="49.3143,31.2967,mm" pictureRotation="0" pictureHeight="27.9119" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="3" frame="false" svgFillColor="255,255,255,255" background="false" file="../../Gun Run 2023.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31663,9 +30274,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="2" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" positionLock="true" visibility="1" frame="false" position="5.84321,406.626,mm" positionOnPage="5.84321,406.626,mm" size="236.083,0.14328,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="5.84321,406.626,mm" shapeType="1" visibility="1" position="5.84321,406.626,mm" itemRotation="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" id="" size="236.083,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="2" frame="false" background="false" excludeFromExports="0" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31678,7 +30289,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31686,7 +30297,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}">
+          <layer enabled="1" id="{1e97db68-5bb3-4e47-b014-91e48d64a4b4}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -31710,9 +30321,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem opacity="1" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="5.03,5.9483,mm" drawCanvasItems="false" positionOnPage="5.03,5.9483,mm" mapFlags="0" size="286.94,392.396,mm" background="true" id="" itemRotation="0" mapRotation="0" followPresetName="Marshal plan" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="5.03,5.9483,mm" visibility="1" followPreset="true" position="5.03,5.9483,mm" itemRotation="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" size="286.94,392.396,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="true" excludeFromExports="0" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" opacity="1" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Marshal plan" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31741,16 +30352,16 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.89580042337001231" ymin="-33.91890002608484167" xmin="18.39785407807089612" xmax="18.41474568521422484"/>
+        <Extent xmax="18.41474568521422484" xmin="18.39785407807089612" ymax="-33.89580042337001231" ymin="-33.91890002608484167"/>
         <LayerSet/>
-        <AtlasMap scalingMode="2" margin="0" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame html="Page [% &quot;page&quot; %] " useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="Page [% &quot;page&quot; %] " evaluateExpressions="true" templateUuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{7e3debe3-7aaf-4f92-bab4-64741eab55c3}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: center; }">
         <childFrame templateUuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}" uuid="{58088dc3-a969-4abe-a44e-9398f7be81fe}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -31765,7 +30376,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Fun Run &amp; Pet Walk, 10KM &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM'&#xa;END&#xa;%]&lt;/strong>" evaluateExpressions="true" templateUuid="{18952565-acc6-4537-a62b-b55da9513a4f}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{18952565-acc6-4537-a62b-b55da9513a4f}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: left; }">
         <childFrame templateUuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}" uuid="{9153fa3b-27b8-435a-abd0-415c52e35ffd}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -31780,7 +30391,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutMultiFrame>
-      <LayoutMultiFrame 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>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame 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>" evaluateExpressions="true" templateUuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{2ab27a95-45a3-4c72-994d-88194fe7a5f4}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 1.66667 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 7.05556px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}" uuid="{7a40a785-97e3-4a5b-9273-437c78947ecf}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -31811,13 +30422,13 @@ def my_form_open(dialog, layer, feature):
           <Option value="0" name="pdfTextFormat" type="int"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="marshal_overviews" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;page&quot;" sortFeatures="1" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" sortAscending="1" filterFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayerProvider="ogr" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="marshal_overviews" hideCoverage="1" sortKey="page" pageNameExpression="&quot;page&quot;" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" sortAscending="1" coverageLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" filterFeatures="0" coverageLayerProvider="ogr"/>
     </Layout>
-    <Layout printResolution="300" name="Fencing" worldFileMap="" units="mm">
+    <Layout name="Fencing" units="mm" printResolution="300" worldFileMap="">
       <Snapper snapToGuides="1" snapToItems="1" tolerance="5" snapToGrid="0"/>
-      <Grid resUnits="mm" offsetUnits="mm" offsetX="0" offsetY="0" resolution="10"/>
+      <Grid offsetX="0" resUnits="mm" resolution="10" offsetUnits="mm" offsetY="0"/>
       <PageCollection>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -31825,7 +30436,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}">
+          <layer enabled="1" id="{33898621-24b6-4a0f-ad6f-29711c6feb21}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -31848,9 +30459,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem opacity="1" type="65638" excludeFromExports="0" zValue="0" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" positionLock="false" visibility="1" frame="false" position="0,0,mm" positionOnPage="0,0,mm" size="297,210,mm" background="true" id="" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-          <FrameColor blue="0" green="0" red="0" alpha="255"/>
-          <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+        <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="0,0,mm" visibility="1" position="0,0,mm" itemRotation="0" templateUuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" id="" size="297,210,mm" frameJoinStyle="miter" blendMode="0" zValue="0" frame="false" background="true" excludeFromExports="0" uuid="{c59deed5-6a5a-419f-91db-8a9aa027316d}" opacity="1" positionLock="false" type="65638" groupUuid="">
+          <FrameColor blue="0" red="0" green="0" alpha="255"/>
+          <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31863,7 +30474,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -31871,7 +30482,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}">
+            <layer enabled="1" id="{62e5e15b-27b9-4639-9ff9-33bbe62f4d06}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -31897,9 +30508,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem wrapChar="" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" legendFilterByAtlas="0" maxSymbolSize="0" id="" zValue="11" symbolWidth="7" wmsLegendWidth="50" symbolHeight="4" excludeFromExports="0" opacity="1" position="256.808,5.21277,mm" columnSpace="2" blendMode="0" title="" outlineWidthM="0.3,mm" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" boxSpace="2" itemRotation="0" referencePoint="0" resizeToContents="0" symbolAlignment="1" frame="true" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" rasterBorder="1" background="true" visibility="1" splitLayer="0" positionOnPage="256.808,5.21277,mm" size="38.1563,68.0108,mm" columnCount="1" titleAlignment="1" frameJoinStyle="miter" type="65642" equalColumnWidth="1" minSymbolSize="0" rasterBorderColor="0,0,0,255" wmsLegendHeight="25" positionLock="true" rasterBorderWidth="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65642" opacity="1" rasterBorderColor="0,0,0,255" position="256.808,5.21277,mm" legendFilterByAtlas="0" columnCount="1" rasterBorder="1" symbolWidth="7" rasterBorderWidth="0" boxSpace="2" map_uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" equalColumnWidth="1" background="true" maxSymbolSize="0" groupUuid="" frame="true" symbolAlignment="1" resizeToContents="0" referencePoint="0" frameJoinStyle="miter" positionOnPage="256.808,5.21277,mm" minSymbolSize="0" itemRotation="0" templateUuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" wmsLegendHeight="25" titleAlignment="1" outlineWidthM="0.3,mm" title="" uuid="{5b751bb5-269f-4a08-a9af-0cf2269cb18d}" visibility="1" splitLayer="0" wrapChar="" blendMode="0" wmsLegendWidth="50" excludeFromExports="0" columnSpace="2" positionLock="true" size="38.1563,68.0108,mm" id="" symbolHeight="4" zValue="11">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31916,13 +30527,13 @@ def my_form_open(dialog, layer, feature):
           <map uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}"/>
         </filterByMaps>
         <styles>
-          <style indent="0" name="title" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="title" alignment="1" indent="0">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31930,7 +30541,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -31954,7 +30565,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -31964,13 +30575,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="group" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="5.2333359999999995" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="group" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="5.2333359999999995" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -31978,7 +30589,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32002,7 +30613,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32012,13 +30623,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="3" name="subgroup" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="75" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="subgroup" alignment="1" indent="0" marginTop="3">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="75" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -32026,7 +30637,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32050,7 +30661,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32060,13 +30671,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2.5" name="symbol" alignment="1">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="9" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbol" alignment="1" indent="0" marginTop="2.5">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="9" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -32074,7 +30685,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32098,7 +30709,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32108,13 +30719,13 @@ def my_form_open(dialog, layer, feature):
               </dd_properties>
             </text-style>
           </style>
-          <style indent="0" marginTop="2" name="symbolLabel" alignment="1" marginLeft="2">
-            <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="4.5277799999999999" multilineHeightUnit="MM" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <style name="symbolLabel" alignment="1" indent="0" marginLeft="2" marginTop="2">
+            <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="MM" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="4.5277799999999999" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
               <families/>
-              <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-              <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-              <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-                <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+              <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+              <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+              <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+                <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                   <data_defined_properties>
                     <Option type="Map">
                       <Option value="" name="name" type="QString"/>
@@ -32122,7 +30733,7 @@ def my_form_open(dialog, layer, feature):
                       <Option value="collection" name="type" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                  <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                     <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"/>
@@ -32146,7 +30757,7 @@ def my_form_open(dialog, layer, feature):
                   </layer>
                 </symbol>
               </background>
-              <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+              <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
               <dd_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32161,11 +30772,11 @@ def my_form_open(dialog, layer, feature):
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group name="Fencing and Cones" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Fencing and Cones" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./fencing.shp|layername=fencing" patch_size="0,0" name="fencing" expanded="1" legend_split_behavior="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" legend_exp="" name="fencing" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./fencing.shp|layername=fencing" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" name="expandedLegendNodes" type="QString"/>
@@ -32177,11 +30788,11 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group name="Routes" expanded="1" checked="Qt::Checked" groupLayer="">
+          <layer-tree-group name="Routes" expanded="1" groupLayer="" checked="Qt::Checked">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer source="./all_routes.shp|layername=all_routes" patch_size="0,0" name="all_routes" expanded="1" legend_split_behavior="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" legend_exp="" checked="Qt::Checked">
+            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" legend_exp="" name="all_routes" legend_split_behavior="0" patch_size="0,0" expanded="1" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" providerKey="ogr">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -32195,9 +30806,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="10" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" labelText="FENCING: [% &quot;name&quot; %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,191.188,mm" positionOnPage="6.76779,191.188,mm" marginX="0" size="148.46,6.45211,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,191.188,mm" marginX="0" visibility="1" position="6.76779,191.188,mm" itemRotation="0" templateUuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" id="" size="148.46,6.45211,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="10" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{ffda53cd-955c-4830-b155-de95a9c684e9}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="FENCING: [% &quot;name&quot; %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32210,12 +30821,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="63" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="63" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32223,7 +30834,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32247,7 +30858,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32257,9 +30868,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" sectionWidth="56.3557" type="65647" excludeFromExports="0" zValue="9" referencePoint="0" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" outlineWidthM="0.3,mm" hideBackgroundIfEmpty="0" groupUuid="" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" positionLock="true" sectionY="0" visibility="1" frame="false" position="182.723,191.188,mm" positionOnPage="182.723,191.188,mm" sectionHeight="5.76" size="56.3557,6.45237,mm" sectionX="0" background="false" hidePageIfEmpty="0" id="" itemRotation="0" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" hideBackgroundIfEmpty="0" positionOnPage="182.723,191.188,mm" visibility="1" position="182.723,191.188,mm" itemRotation="0" templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" id="" size="56.3557,6.45237,mm" frameJoinStyle="miter" hidePageIfEmpty="0" blendMode="0" zValue="9" sectionWidth="56.3557" frame="false" multiFrame="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionY="0" background="false" excludeFromExports="0" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" opacity="1" sectionX="0" positionLock="true" type="65647" groupUuid="" multiFrameTemplateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" sectionHeight="5.76">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32273,9 +30884,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="8" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" labelText="REVISION 1.1" valign="32" positionLock="true" visibility="1" frame="false" position="212.258,198.083,mm" positionOnPage="212.258,198.083,mm" marginX="0" size="26.8205,6.82826,mm" background="false" id="" halign="2" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="212.258,198.083,mm" marginX="0" visibility="1" position="212.258,198.083,mm" itemRotation="0" templateUuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" id="" size="26.8205,6.82826,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="8" halign="2" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{4bb0566b-5d43-464a-83d9-275ddb6521af}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="REVISION 1.1" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32288,12 +30899,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32301,7 +30912,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32325,7 +30936,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32335,9 +30946,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="1" type="65641" excludeFromExports="0" zValue="7" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" valign="32" positionLock="true" visibility="1" frame="false" position="62.6706,198.083,mm" positionOnPage="62.6706,198.083,mm" marginX="1" size="51.1638,7.07327,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="62.6706,198.083,mm" marginX="1" visibility="1" position="62.6706,198.083,mm" itemRotation="0" templateUuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" id="" size="51.1638,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="7" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{05add5f4-f9df-459e-80f8-ff7085d33224}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginY="1">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32350,12 +30961,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32363,7 +30974,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32387,7 +30998,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32397,9 +31008,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" marginY="0" type="65641" excludeFromExports="0" zValue="5" referencePoint="0" outlineWidthM="0.3,mm" htmlState="0" groupUuid="" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" labelText="Page [% @atlas_featurenumber %]" valign="32" positionLock="true" visibility="1" frame="false" position="6.76779,198.083,mm" positionOnPage="6.76779,198.083,mm" marginX="0" size="90.2083,7.07327,mm" background="false" id="" halign="1" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.76779,198.083,mm" marginX="0" visibility="1" position="6.76779,198.083,mm" itemRotation="0" templateUuid="{0f8a14b7-c082-4232-8292-36397ad47054}" id="" size="90.2083,7.07327,mm" valign="32" frameJoinStyle="miter" blendMode="0" zValue="5" halign="1" frame="false" htmlState="0" background="false" excludeFromExports="0" uuid="{0f8a14b7-c082-4232-8292-36397ad47054}" opacity="1" positionLock="true" type="65641" groupUuid="" labelText="Page [% @atlas_featurenumber %]" marginY="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32412,12 +31023,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32425,7 +31036,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32449,7 +31060,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32459,9 +31070,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem opacity="1" svgBorderColor="0,0,0,255" mode="1" pictureWidth="49.3143" mapUuid="" type="65640" excludeFromExports="0" zValue="4" referencePoint="0" resizeMode="0" svgFillColor="255,255,255,255" outlineWidthM="0.3,mm" file="../GunRun2023_250.png" anchorPoint="8" groupUuid="" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" pictureHeight="28.0105" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" positionLock="true" visibility="1" frame="false" position="243.098,175.353,mm" positionOnPage="243.098,175.353,mm" size="49.3143,29.8354,mm" svgBorderWidth="0.2" background="false" id="" itemRotation="0" northMode="0" northOffset="0" blendMode="0" frameJoinStyle="miter" pictureRotation="0">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" resizeMode="0" positionOnPage="243.098,175.353,mm" visibility="1" mode="1" position="243.098,175.353,mm" svgBorderWidth="0.2" itemRotation="0" templateUuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" northMode="0" id="" size="49.3143,29.8354,mm" pictureRotation="0" pictureHeight="28.0105" svgBorderColor="0,0,0,255" frameJoinStyle="miter" anchorPoint="8" blendMode="0" zValue="4" frame="false" svgFillColor="255,255,255,255" background="false" file="../GunRun2023_250.png" pictureWidth="49.3143" excludeFromExports="0" uuid="{a0c48182-c7c3-4020-ab54-ab927d6e6485}" opacity="1" positionLock="true" type="65640" groupUuid="" northOffset="0" mapUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32481,9 +31092,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem opacity="1" shapeType="1" type="65643" excludeFromExports="0" zValue="3" referencePoint="0" outlineWidthM="0.3,mm" groupUuid="" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" positionLock="true" visibility="1" frame="false" position="6.91779,197.79,mm" positionOnPage="6.91779,197.79,mm" size="232.01,0.14328,mm" background="false" id="" cornerRadiusMeasure="0,mm" itemRotation="0" blendMode="0" frameJoinStyle="miter">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" positionOnPage="6.91779,197.79,mm" shapeType="1" visibility="1" position="6.91779,197.79,mm" itemRotation="0" templateUuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" id="" size="232.01,0.14328,mm" frameJoinStyle="miter" blendMode="0" zValue="3" frame="false" background="false" excludeFromExports="0" uuid="{68c41f1f-56f3-41c3-9516-3f1bc02020cc}" opacity="1" cornerRadiusMeasure="0,mm" positionLock="true" type="65643" groupUuid="">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32496,7 +31107,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+        <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
           <data_defined_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32504,7 +31115,7 @@ def my_form_open(dialog, layer, feature):
               <Option value="collection" name="type" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{96fb0bca-784b-4a29-b691-c08ef223150d}">
+          <layer enabled="1" id="{96fb0bca-784b-4a29-b691-c08ef223150d}" locked="0" pass="0" class="SimpleFill">
             <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"/>
@@ -32528,9 +31139,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem segmentSizeMode="1" segmentMillimeters="25.8173" id="" zValue="2" labelHorizontalPlacement="0" unitLabel="m" excludeFromExports="0" height="2" lineJoinStyle="round" outlineWidth="0.2" opacity="1" position="6.76779,2.8482,mm" blendMode="0" unitType="meters" labelVerticalPlacement="0" boxContentSpace="0.2" maxBarWidth="100" outlineWidthM="0.3,mm" labelBarSpace="1" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" itemRotation="0" referencePoint="0" minBarWidth="25" numUnitsPerSegment="20" numSegmentsLeft="2" style="Double Box" frame="false" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" background="false" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" visibility="1" numMapUnitsPerScaleBarUnit="1" numSegments="2" positionOnPage="6.76779,2.8482,mm" size="87.2133,15.8378,mm" frameJoinStyle="miter" subdivisionsHeight="1.5" type="65646" lineCapStyle="square" positionLock="true" numSubdivisions="1" alignment="0" groupUuid="">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem type="65646" outlineWidth="0.2" numSegmentsLeft="2" opacity="1" segmentSizeMode="1" position="6.76779,2.8482,mm" alignment="0" minBarWidth="25" labelHorizontalPlacement="0" lineCapStyle="square" labelVerticalPlacement="0" numSubdivisions="1" mapUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" unitLabel="m" numMapUnitsPerScaleBarUnit="1" boxContentSpace="0.2" labelBarSpace="1" height="2" numUnitsPerSegment="20" background="false" groupUuid="" segmentMillimeters="25.8173" frame="false" unitType="meters" referencePoint="0" frameJoinStyle="miter" positionOnPage="6.76779,2.8482,mm" lineJoinStyle="round" itemRotation="0" templateUuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" maxBarWidth="100" outlineWidthM="0.3,mm" uuid="{c4e21319-f58e-481d-bbd9-db48ba57faa1}" numSegments="2" subdivisionsHeight="1.5" visibility="1" blendMode="0" excludeFromExports="0" positionLock="true" style="Double Box" size="87.2133,15.8378,mm" id="" zValue="2">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32543,12 +31154,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="12" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+        <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="12" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
           <families/>
-          <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-          <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-          <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-            <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+          <text-mask maskedSymbolLayers="" maskSize="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+          <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+            <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32556,7 +31167,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+              <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                 <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"/>
@@ -32580,7 +31191,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+          <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
           <dd_properties>
             <Option type="Map">
               <Option value="" name="name" type="QString"/>
@@ -32589,7 +31200,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor blue="0" green="0" red="0" alpha="255"/>
+        <strokeColor blue="0" red="0" green="0" alpha="255"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" type="invalid"/>
@@ -32601,10 +31212,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" type="invalid"/>
           </Option>
         </numericFormat>
-        <fillColor blue="0" green="0" red="0" alpha="255"/>
-        <fillColor2 blue="255" green="255" red="255" alpha="255"/>
+        <fillColor blue="0" red="0" green="0" alpha="255"/>
+        <fillColor2 blue="255" red="255" green="255" alpha="255"/>
         <lineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32612,7 +31223,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{ba8b697f-af10-49bc-b789-55678d099479}">
+            <layer enabled="1" id="{ba8b697f-af10-49bc-b789-55678d099479}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -32653,7 +31264,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32661,7 +31272,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}">
+            <layer enabled="1" id="{4871f7e0-8d7b-4200-9b0c-fb736c2d9764}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -32702,7 +31313,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32710,7 +31321,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}">
+            <layer enabled="1" id="{50c1b75e-3d7b-426d-82dd-7af8813fa644}" locked="0" pass="0" class="SimpleLine">
               <Option type="Map">
                 <Option value="0" name="align_dash_pattern" type="QString"/>
                 <Option value="square" name="capstyle" type="QString"/>
@@ -32751,7 +31362,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32759,7 +31370,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{7f05af9e-0111-48af-a2c9-889d710570e0}">
+            <layer enabled="1" id="{7f05af9e-0111-48af-a2c9-889d710570e0}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -32784,7 +31395,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+          <symbol name="" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
             <data_defined_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -32792,7 +31403,7 @@ def my_form_open(dialog, layer, feature):
                 <Option value="collection" name="type" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="{c90aa551-e7ed-4710-acac-e5698540a53e}">
+            <layer enabled="1" id="{c90aa551-e7ed-4710-acac-e5698540a53e}" locked="0" pass="0" class="SimpleFill">
               <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"/>
@@ -32817,9 +31428,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem opacity="0.9" type="65639" excludeFromExports="0" zValue="1" referencePoint="0" keepLayerSet="false" outlineWidthM="0.3,mm" groupUuid="" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" isTemporal="0" followPreset="true" positionLock="true" visibility="1" frame="false" position="6.76779,9.35102,mm" drawCanvasItems="false" positionOnPage="6.76779,9.35102,mm" mapFlags="0" size="283.418,180.92,mm" background="false" id="" itemRotation="0" mapRotation="0" followPresetName="Fencing" blendMode="0" frameJoinStyle="miter" labelMargin="0,mm">
-        <FrameColor blue="0" green="0" red="0" alpha="255"/>
-        <BackgroundColor blue="255" green="255" red="255" alpha="255"/>
+      <LayoutItem outlineWidthM="0.3,mm" referencePoint="0" labelMargin="0,mm" keepLayerSet="false" positionOnPage="6.76779,9.35102,mm" visibility="1" followPreset="true" position="6.76779,9.35102,mm" itemRotation="0" templateUuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" id="" size="283.418,180.92,mm" frameJoinStyle="miter" blendMode="0" zValue="1" mapFlags="0" frame="false" mapRotation="0" background="false" excludeFromExports="0" uuid="{36206abe-8b54-42d8-a581-ec49c5c41f87}" opacity="0.9" positionLock="true" type="65639" groupUuid="" drawCanvasItems="false" followPresetName="Fencing" isTemporal="0">
+        <FrameColor blue="0" red="0" green="0" alpha="255"/>
+        <BackgroundColor blue="255" red="255" green="255" alpha="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32854,7 +31465,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymax="-33.94132830492694808" ymin="-33.94258732662760991" xmin="18.37624285840067628" xmax="18.37821516684363488"/>
+        <Extent xmax="18.37821516684363488" xmin="18.37624285840067628" ymax="-33.94132830492694808" ymin="-33.94258732662760991"/>
         <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>
@@ -32869,9 +31480,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid topAnnotationDisplay="3" rightAnnotationDisplay="3" rightAnnotationPosition="1" gridFrameMargin="0" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rotatedAnnotationsMinimumAngle="0" topAnnotationDirection="0" annotationPrecision="3" gridStyle="0" show="0" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" showAnnotation="0" leftAnnotationDirection="0" bottomAnnotationPosition="1" intervalY="5" minimumIntervalWidth="50" annotationFormat="4" gridFramePenColor="0,0,0,255" position="3" blendMode="0" rotatedAnnotationsLengthMode="0" leftFrameDivisions="0" maximumIntervalWidth="100" rotatedAnnotationsMarginToCorner="0" gridFrameStyle="0" offsetY="0" rightFrameDivisions="0" crossLength="3" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" rotatedAnnotationsEnabled="0" annotationExpression="" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" intervalX="5" leftAnnotationPosition="1" gridFramePenThickness="0.5" topFrameDivisions="0" offsetX="0" rightAnnotationDirection="0" name="Grid 1" unit="1" frameAnnotationDistance="1" bottomFrameDivisions="0" topAnnotationPosition="1" bottomAnnotationDisplay="3" bottomAnnotationDirection="0">
+        <ComposerMapGrid gridFramePenColor="0,0,0,255" rightAnnotationDirection="0" topAnnotationDirection="0" bottomAnnotationDirection="0" frameFillColor1="255,255,255,255" unit="1" position="3" bottomFrameDivisions="0" rightAnnotationPosition="1" rotatedAnnotationsMinimumAngle="0" maximumIntervalWidth="100" annotationExpression="" intervalY="5" rightFrameDivisions="0" gridFramePenThickness="0.5" rightAnnotationDisplay="3" leftAnnotationPosition="1" rotatedTicksMarginToCorner="0" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksLengthMode="0" rotatedTicksEnabled="0" gridFrameStyle="0" show="0" leftAnnotationDisplay="3" offsetY="0" topAnnotationPosition="1" intervalX="5" bottomAnnotationPosition="1" gridFrameWidth="2" leftFrameDivisions="0" name="Grid 1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" gridFrameMargin="0" crossLength="3" offsetX="0" rotatedAnnotationsMarginToCorner="0" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" blendMode="0" minimumIntervalWidth="50" rotatedAnnotationsEnabled="0" topAnnotationDisplay="3" showAnnotation="0" leftAnnotationDirection="0" annotationFormat="4" gridStyle="0" annotationPrecision="3" topFrameDivisions="0" bottomAnnotationDisplay="3" frameAnnotationDistance="1">
           <lineStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="line" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="line" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32879,7 +31490,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleLine" id="{7f8bc30c-a977-4770-97ae-b052397815c8}">
+              <layer enabled="1" id="{7f8bc30c-a977-4770-97ae-b052397815c8}" locked="0" pass="0" class="SimpleLine">
                 <Option type="Map">
                   <Option value="0" name="align_dash_pattern" type="QString"/>
                   <Option value="square" name="capstyle" type="QString"/>
@@ -32920,7 +31531,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol frame_rate="10" name="" force_rhr="0" is_animated="0" type="marker" clip_to_extent="1" alpha="1">
+            <symbol name="" is_animated="0" type="marker" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
               <data_defined_properties>
                 <Option type="Map">
                   <Option value="" name="name" type="QString"/>
@@ -32928,7 +31539,7 @@ def my_form_open(dialog, layer, feature):
                   <Option value="collection" name="type" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer locked="0" pass="0" enabled="1" class="SimpleMarker" id="{490d72bf-21ae-4699-adef-94db3e5bc496}">
+              <layer enabled="1" id="{490d72bf-21ae-4699-adef-94db3e5bc496}" locked="0" pass="0" class="SimpleMarker">
                 <Option type="Map">
                   <Option value="0" name="angle" type="QString"/>
                   <Option value="square" name="cap_style" type="QString"/>
@@ -32971,12 +31582,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontLetterSpacing="0" multilineHeight="1" multilineHeightUnit="Percentage" fontStrikeout="0" allowHtml="0" fontFamily="Myriad Pro" previewBkgrdColor="255,255,255,255" forcedItalic="0" textColor="0,0,0,255" textOrientation="horizontal" fontWeight="50" textOpacity="1" namedStyle="" forcedBold="0" fontWordSpacing="0" fontUnderline="0" fontKerning="1" fontSize="10" blendMode="0" capitalization="0" fontItalic="0" fontSizeUnit="Point">
+          <text-style fontStrikeout="0" fontSizeMapUnitScale="3x:0,0,0,0,0,0" forcedItalic="0" fontUnderline="0" fontLetterSpacing="0" fontSizeUnit="Point" fontFamily="Myriad Pro" multilineHeightUnit="Percentage" namedStyle="" fontWeight="50" blendMode="0" fontWordSpacing="0" fontItalic="0" fontSize="10" textColor="0,0,0,255" previewBkgrdColor="255,255,255,255" textOrientation="horizontal" multilineHeight="1" forcedBold="0" fontKerning="1" capitalization="0" textOpacity="1" allowHtml="0">
             <families/>
-            <text-buffer bufferOpacity="1" bufferColor="255,255,255,255" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferJoinStyle="128" bufferBlendMode="0" bufferSizeUnits="MM" bufferSize="1" bufferDraw="0" bufferNoFill="1"/>
-            <text-mask maskSizeUnits="MM" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128"/>
-            <background shapeOffsetX="0" shapeJoinStyle="64" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeType="0" shapeSizeX="0" shapeOffsetUnit="MM" shapeSizeUnit="MM" shapeBorderWidth="0" shapeBorderWidthUnit="MM" shapeRadiiUnit="MM" shapeSizeY="0" shapeDraw="0" shapeSizeType="0" shapeFillColor="255,255,255,255" shapeOpacity="1" shapeOffsetY="0" shapeBorderColor="128,128,128,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRotationType="0" shapeSVGFile="" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeRotation="0" shapeRadiiX="0" shapeRadiiY="0">
-              <symbol frame_rate="10" name="fillSymbol" force_rhr="0" is_animated="0" type="fill" clip_to_extent="1" alpha="1">
+            <text-buffer bufferJoinStyle="128" bufferSizeUnits="MM" bufferOpacity="1" bufferColor="255,255,255,255" bufferDraw="0" bufferSize="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferNoFill="1" bufferBlendMode="0"/>
+            <text-mask maskedSymbolLayers="" maskSize="1.5" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskEnabled="0" maskJoinStyle="128" maskOpacity="1" maskSizeUnits="MM" maskType="0"/>
+            <background shapeRotation="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBlendMode="0" shapeRadiiX="0" shapeType="0" shapeRadiiY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeOpacity="1" shapeJoinStyle="64" shapeRadiiUnit="MM" shapeDraw="0" shapeBorderWidth="0" shapeRotationType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetY="0" shapeOffsetUnit="MM" shapeSizeType="0" shapeBorderWidthUnit="MM" shapeFillColor="255,255,255,255" shapeSVGFile="" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeBorderColor="128,128,128,255" shapeOffsetX="0">
+              <symbol name="fillSymbol" is_animated="0" type="fill" frame_rate="10" alpha="1" force_rhr="0" clip_to_extent="1">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option value="" name="name" type="QString"/>
@@ -32984,7 +31595,7 @@ def my_form_open(dialog, layer, feature):
                     <Option value="collection" name="type" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer locked="0" pass="0" enabled="1" class="SimpleFill" id="">
+                <layer enabled="1" id="" locked="0" pass="0" class="SimpleFill">
                   <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"/>
@@ -33008,7 +31619,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowDraw="0" shadowOffsetAngle="135" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetUnit="MM" shadowRadius="1.5" shadowColor="0,0,0,255" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowScale="100" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetDist="1"/>
+            <shadow shadowUnder="0" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowDraw="0" shadowOffsetUnit="MM" shadowOpacity="0.69999999999999996" shadowBlendMode="6" shadowOffsetGlobal="1" shadowRadiusAlphaOnly="0" shadowRadius="1.5" shadowRadiusUnit="MM" shadowColor="0,0,0,255" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetAngle="135"/>
             <dd_properties>
               <Option type="Map">
                 <Option value="" name="name" type="QString"/>
@@ -33030,14 +31641,14 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <AtlasMap scalingMode="2" margin="0.40000000000000002" atlasDriven="1"/>
+        <AtlasMap atlasDriven="1" margin="0.40000000000000002" scalingMode="2"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings enabled="0" clippingType="0" forceLabelsInside="0" clipSource=""/>
       </LayoutItem>
-      <LayoutMultiFrame html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" useSmartBreaks="true" stylesheetEnabled="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" type="65648" resizeMode="0" maxBreakDistance="10" 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; }" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" contentMode="1" evaluateExpressions="true" url="">
+      <LayoutMultiFrame url="" html="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 16 September 2023',&#xa; 'Sunday, 17 September 2023'&#xa;)%]&lt;/strong>" evaluateExpressions="true" templateUuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" maxBreakDistance="10" contentMode="1" stylesheetEnabled="true" type="65648" uuid="{6ed591e3-e471-46fe-8000-8e38627fc5ed}" resizeMode="0" useSmartBreaks="true" stylesheet="body { margin: 0 0;font-family: Myriad Pro;font-style: normal;font-weight: 400;font-size: 17.6389px;color: rgba(0,0,0,1.0000);text-align: right; }">
         <childFrame templateUuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}" uuid="{6e0c9244-e892-4068-906e-5cde5fc68f3e}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -33077,7 +31688,7 @@ def my_form_open(dialog, layer, feature):
           <Option value="true" name="singleFile" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas coverageLayerName="fence_groups" enabled="1" filenamePattern="'output_'||@atlas_featurenumber" pageNameExpression="&quot;name&quot;" sortFeatures="1" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortKey="&quot;group&quot;" sortAscending="1" filterFeatures="0" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" coverageLayerProvider="virtual" hideCoverage="1"/>
+      <Atlas filenamePattern="'output_'||@atlas_featurenumber" enabled="1" coverageLayerName="fence_groups" hideCoverage="1" sortKey="&quot;group&quot;" pageNameExpression="&quot;name&quot;" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" sortAscending="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20WHERE%20%22type%22%20LIKE%20'%25fenc%25'%20GROUP%20BY%20%22group%22" filterFeatures="0" coverageLayerProvider="virtual"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
@@ -33085,7 +31696,7 @@ def my_form_open(dialog, layer, feature):
   <Sensors/>
   <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymax="-33.90048855131077943" ymin="-33.91260376305159951" xmin="18.39943371120850202" xmax="18.42176257945853024">
+    <DefaultViewExtent xmax="18.3966948564276187" xmin="18.39365183857621489" ymax="-33.90669064043363079" ymin="-33.90828503601445476">
       <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>
@@ -33102,13 +31713,13 @@ def my_form_open(dialog, layer, feature):
   <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings frameRate="1" cumulativeTemporalRange="0" timeStepUnit="h" timeStep="1"/>
+  <ProjectTimeSettings timeStep="1" cumulativeTemporalRange="0" timeStepUnit="h" frameRate="1"/>
   <ElevationProperties>
     <terrainProvider type="flat">
       <TerrainProvider scale="1" offset="0"/>
     </terrainProvider>
   </ElevationProperties>
-  <ProjectDisplaySettings CoordinateType="MapCrs" CoordinateAxisOrder="Default">
+  <ProjectDisplaySettings CoordinateAxisOrder="Default" CoordinateType="MapCrs">
     <BearingFormat id="bearing">
       <Option type="Map">
         <Option name="decimal_separator" type="invalid"/>
@@ -33150,7 +31761,7 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </CoordinateCustomCrs>
   </ProjectDisplaySettings>
-  <ProjectGpsSettings destinationLayerName="marshal_positions" autoAddTrackVertices="0" autoCommitFeatures="0" destinationLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" destinationLayerProvider="ogr" destinationFollowsActiveLayer="1" destinationLayerSource="/home/tim/Documents/Projects/2023/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions">
+  <ProjectGpsSettings destinationLayerProvider="memory" destinationLayerSource="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=Source:String(40,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;uid={431ef746-5362-4d7c-bf35-560ac1fcdbbf}" destinationLayer="route_markers_022f7471_3d57_403e_b836_6019bd5d0709" autoAddTrackVertices="0" destinationFollowsActiveLayer="1" autoCommitFeatures="0" destinationLayerName="route_markers">
     <timeStampFields/>
   </ProjectGpsSettings>
 </qgis>
diff --git a/GIS Base Map/marshal_positions.dbf b/GIS Base Map/marshal_positions.dbf
index a349b511665776e27741ff27c078434c8fc31cd0..0be2cb968150fde2a7763a09958efdbf8965e8f2 100644
GIT binary patch
delta 111
zcmZ3phxylDW>)5Sb}5aGtVUsz=Y^fyd^vnJ<L1Rt3q3clUeaL6qo4%`29rOk229>?
tU7XQy^2TO=D2vem%wjV1n!NFNDwC-@h?;!xGFT;(DOhy!#Ldx+QUHf%EfD|!

delta 118
zcmeyhmwC+|W>)5EPHwf0tVUrh#zuxllP9u8OqOQjoNO9)f!V~!aPr5@h{;lHT$`E0
z=Q6SySsED{!j!NY85;r>EDVbTX<#!lHZn3afk|$jAF;@j#nj9IXu^f)$qN>7ZgyH!
IZ^<YH02iku5dZ)H

diff --git a/GIS Base Map/marshal_positions.shp b/GIS Base Map/marshal_positions.shp
index 0006eba170b433ea43d7342e981aa6a12dc9be97..bc5a6b013b656dab43780973372d6a59331caeb0 100644
GIT binary patch
delta 5660
zcmY+I30O^A8^_y)GFE6@(V$5k)In^8V~m7M8H#IYLYLz+Ts~7YC+hYhLzIdxj>?sU
zqAPL{(M3|I%tJ{7xr*;SXZ7Caemzh7InVk1)_<?P&U)A0d*!apS{KWN1E)<g^yhaH
z)YR0P-nX9B@sr9v$6p_j*&xfuuO8yRI{qvFO7UOitq+?u<F>C<wn1?s-MLZaJt8Jm
z1c}f6rLsbC#ht#Km4Sx=6COh#9?L;tz{Co&uNNOb6|qbz3)?lb`Y1o+6JqYYHP6mi
zDwTcrowr`#Nl)Vp+2Cg=P?swI^|^`~HrvJY?6ycM>uO&*rnyPgy=w3<WWsX@G-Ton
z@?J)y?QX!!$bOWW(#TK#l33VpX}0yqqHMfJ*Kqa<@-gEzRA9y%@-7z0BEptSWtDF_
zfg3;9TVkGPl8OS6<u|!iTXXgf9E_Oo9^8$X_<_7_#r79k1EjK^4a+PB^9!vZ)=}f?
zQ7I0>Je^7X>^ZB2B+U2-xtLK$UdcYKrvq>xm)y(Q9>Kj&#8yjIc^_UZl})U1G|%Jx
zs0STmX4QZOjb!7$J~#dA^JnldW*xuKH(+aQ3SexYuJ#QS#>T_cT9BwF#SxS4`agW6
zvKp-)Psj5fv=W;Y`b|#*Csv8UPx4!QG{46&V|BG3V8WP)8qZjiTj+Rnp;Y!{)kT}}
z&B|X+P|izLe%JbtidbY$lI3$fI8z5XV}b@mV@5mj$|tUP-V?o>UCTn^xYwT8BKdN2
zBV?oX7I>v_)&VLpLlassLyNrhsd_<f=pEf*WnIp_j>H;@yyto%i{2AeP|aB<@GxOQ
zX9zT5Vi)r4N~(+3pm#oCL`ehpx)OWRXLLdcvc#p+=X~R=8{}h#HdJ7S4tdk>hVQ+A
zUTyils;*yE<DpBexMSk(B4o~$)7Ew8tUEaLVnPpa@5RKP<dq&SzHEZk@S)?I>BXN_
z8G6JF&w9Pgz>F2UY<qp=Odpak!vJzI!;ri!g_QyO(PK^v)yIBOWf&1lO@XmZ$eMcp
zF>Wzu#-P)i2@E8?nP@`Z0!e&)d+bMc;QVV7`8D?<7VE{FPhduc;lQ#G&U!--W|%?(
zW|)z;akCJ49KApKo%p4ed*;L@_g!;-#}cW`)xppEfNK5;7Ep&7eV~ge6D`Tp>!Pvx
zB+k?J?H(4-=AIQXpPc-hd&nv_eYcy;nKdjlWr7WCGG&8p$=lX)-~27E4kvGovaeOm
zXQ3~$wptSG{`J`&ity|bYWYzT_~{1LdgbMA26p@m{fIr3W@{%R>oD#5Jxk8|gP9o<
z27rqh6CKEVZ`U|I0M`{?ef^ZFs(Kb2iS2nE6FL^zm2ahao}5V`7BdEd0y74Y_upUM
zIa#9D$9`7SAnpw&woq@Eu_?0tS$>WKIdh6LXTlILF=ygX(#C7%e`2V)2X;Twk88?G
zRuyZ{r5kn{B0E*Ey|;w3VIap0XNblO7xHZ9gdD5FW$U8tUWYn<$-{|tj+<EW1li+t
z?~H0W8v&J=F%nuZLq^_tmt><H^umP)A8&AP6tQ+;!?b=y_TDGOKZ~=`;9<dpF%W3M
z#IfYbbnErA(StElL*DR-HICTkgKx`EBXf?Op!0#V@sN)hu26v)6Ue)2;HEu1P%7JJ
z8l2MkZ&i^@B<Adqa$Cgl@LSrUyC-LE;LwK&lfb<X6Wz%(X|R9ggA3(m?bh3G`MD+&
ztJ)A%VT_aRK;o$xCpen|NtiJeaxue$Jgr&3R5suwem3K*+ivbnBUX3%&Q}f0SW-3W
zo*!q^LC2B_GeBa=#F^whGTfi_1HHxmx;q>B?>CFs1S<;<FPx@oeZ%*U=FAg<Fk?0(
zV8$Hs-VB(wWHNdct*hES;A20R*va9=VMp*OVfW7?JkN1959%<(3%Xdbt={BKxZ+V6
zfnM`G_Z^PhoBt16YmgC)EH$*R?*Psg5X(=z(0LOw$?8~zgtMQB>HBZ~DH2)9#Y`%}
zg~VRT2f1DGx0A}&=2<$c^M;EE4k=t_aS0pBAJ=^64<y23xNF6PCGf$Di9Y1z6--G8
zReHTY>JQ_qgD<f!*E92f;GnoZ9~a-B=lg-onhE~kZOz00^16n04v0eU^vciLyLiS@
zV$DVy<uOXOc$n)>&Xz$YW-Nyy%m^fJL3*%j2zoACq8uZ+_cO5)#mU-8WcE1^aw9lf
z0cJK#SP3pROq7!+J8LjH7`>P4@5F>~ZxykW$~z~+k*#=e)3=TN2VyZ}H7GD+4S8u_
zjy(Po$D?L|e|#{{SW7Ig%sM#;GvxZyKe%wVF3y$-zkrD?6W5dGqLo~<4Yjg|nZMg{
zZ3D5i#afffaIQ`+w%nk}hxET7$Bc~-jTxKBlUe#}6k}cZWkrQg;ofFq10{PNp2rM_
z#m!5!Iokr2n6VXFFe8Y(Yc*<J>(ILpmieu1;onAV;*#a1pOEd)C^2u~ecTQneVGsp
zfqmJm5b|71=EwVCjVIqT{@s^*p~UWwlg-J%wdUeiYrQ63pJBu@AGF*$gu^&8)HJm1
z1{V$$eVG_R#^29Yc<o2S*=c5cTeU<I>pU&(&xLr_gYV`%d&QHZz`>3QJHXwJjf*C)
z(SP~O`8d*ofu-MNJ`y{Lt-O6LM>!eFbM7>b<UQYojBa}|ps-_NEZLKXZgm}l_KYh-
zo7>jZUx}Gp$r?{!PtT?*GK~1cOB|TkGZDzJ+3%CCT-8OV6^B-GV>dAe*Wbb(BYXWN
zQGEqxdq8f_guM`r8S&(8$&Grhz*YB;z(wZ@xVMkkm~}q0KV$E*)iu|*@@v@-m6&k=
zS}@}vdG)E`yWioj`p7qRW!o>FKx~rXxedyhcjcI2VJALThrmO^gu@UhVPYbAdFe+I
zlhM-+Z8ye<dr8C!Y;5Y2kiDH`^+KPsBan|7$xwkADdY{%O-K$vj~Vp4X~DfzVk3*Q
zEf*s*yP7<*?ZM$FIP_z}F>vq4#5D41Zf)KB4J+Wr8ONKWc*bwUS|Se^HX(aisJCb=
zXU8E4GfqG*W}GCi)<&LHfL{58Qx0>vry!<1j>TL;HnU*1mltQJK&L+w(m~Rni5cW2
zz1|roNAF2$bM;d0WfIfK42upxR&hzbW;ti4AqX>mhXl+xLtbGQdka(aT=QByHghkF
znES@|@kYpAMfcI&%Gp_{!;Ea`GJuKa$ctPPvf~UsGN!4$x}MCv9Afz{nWo2(rC&MS
ze3G;Cuy6nqF2E+txJaHym3N2r=yiMZz^90Nxx{R5pXf3R+0nB9Jgw#|5AI^dCHR0D
zm&wcX@8LQSz1y0HmTK}lYCf^F*OJ{1$Xfo|py<fiA0TsJ!WHm#U}6Dzr4niF-}sW3
zwz08p0{5;G%L?;Y-HdGGiKbF_&aOcwW)wmZW?UyPY+!=xCG;E*PQMn#y+4VWj{5R2
z8`=25r#r@Qb_2{DnQ#+a9GQ5FJa#szVhVb1b~ZU3=Ux%9jdlI&?2zr5YLk%0*=>l$
zj60yfjAHWgG7rALj;{(mHUw53<KA6jGwWX+DnNFyB|*0>|6ZJw2_;}6W#V6?1$!IK
z{~0y23%Y;Z=MndbmB^j9{e<ki&KcPw&K`gqGaf=TX8g0w(QF#Nv>h&)x!VU;-{ecg
zBg$|~J6NsUDk)x@k$#%9GN{Ci$IyZq<>Y<xPIGrfFFGP&#A@zU5DOpVuq*&sFD;Y&
zwj03{@EFL1rw}-hiOPKr)x-4H?vuAipx19s!S^*hqmr1@p|P$Z$gH0YSFGc#3i2_d
z8Y(d3IeFP-=T`Q?1-Hjs^C5-YdqGTa+_}aDS$@>*`}a6|2@Zpp@Cw`qG4VBdK12Q*
zXNP+cW}dm_b=-SH%zntO0i!X)(>S-xlC!svgc<K37c<_Icdp0Ax36%i3JJS^LczTc
z#14<WIIjs=f3M~Pb2+O4oxx0~1<7D0ek4z0)R+yKSl-*cHK)ztWmQLP(Wc0WURW-(
zt)^5JbM^^>Fryw4FhjZHp&HX1LGQz5oQitC4^9u}bD)vf#e?2k%#p$IU#}%|)&zB!
z@fo@}F;Te}qRLQ|PF8D&^Jr3YlzRjBnu)#0DxUfs-&BK!*HpE!udvX`SY7xVHaQs&
z6TXo-Bek?u`A!?CA(dG1ckmWsulG*8pN*{V`Wquha@GoWl_}rhgEHj@nFZy#hZSh<
za$91)NM)+-%Bp_8zmVAyiMLCKTkdfws&Q2pKsJO4>fk+ui5isQvoFBF6TK4M)CU*1
z*N)iB#3L{CkTq}Xno-1Ad&tC$4p4*{n&e&asoJ~)y&TVA*BsUOt7{Qkan;^%8M1ue
zXuo5ebp*4aOy~qILz&o_JnxuQtr<Aa_G%ejoyol}#3V}(pWcGE?Rni|X7PGb?+US)
z(G3)M)P_ot2|Cb%N8LC)bO#eW_5hDzOy~)Lc+>+qexnc3cr;KoHB>b<QZ+SJHD$`C
zCaR{rR84!UnwqMbnkk!Z{b%1nZ?5g$Q`p=2`$yE8sva`bEvUEahwNV89@*A;zkU}u
z>qG4Ga=pu6@k%O()?2hOOJee`PJUU)4ClwRYg9d~ssFP_QRJsRBhi0>RCdd{G<Y8$
w9&2jYWZye=AC_T``PwSJ4XAEIjHN^_kN$sVOYHHoFZWL((|5aF8jYF%1N;J)HUIzs

delta 5493
zcmYkA3p|zQAHaK22vI4Q$35h@g_K@YC*3qGt&xQ$Vk(vXsby(X)Ve6<S6Z=XDhq{{
zqS16&T2rEngpw{Qlt^<a{eRBWZ=d>nI^NIuexL7o-urvbsdXi5lbEomKre5!m)s!!
z?+*SMD&R|3%lkr&FbC<|edSZ~JEdj#Rt^3q?=CLOywaBEuGQZ-NYjpJe~9B=Ewqnj
z!aY#cVu5w!<(>cFQyuCct&GdwJo$~RS5M6C^9?C8@v|~2+7?CeM#Cqcb^nv)2cIlA
zLXZ{{9zu*3`=N<io(77A^OrhE`$HG57x?EqA{KRJ$WIH9om{xE_al4!N$<%g%TH-c
zw`HQ{u*D8iHLIHG-CeSIHxp~#cfR0Qkb~4!ZRq`sptmyk42-my@ElyVnfQXlt-obi
zbl}SG7#rZ$##gX~SoJiQuKsWb=_nP&CObaiR!G7|8{}f+C3(KTXH-NicaWBKeb!{o
zC-RC|;(}(yMabq)_o|g})}E}xgx8>_!^95Kl;tlSalrLosNrE_#XqW(*gSQ`GbK2U
z=5xvGC7iv1NNjXLf)1PTmb^9As{;-OJ4olW*&CPgkNTHb#*yE&a*;(#B+Vtrz(UtB
zl#ZA_vKsPJ)DNTO+7P{{h!@@=Bk%nu%l)4$f1vS0Tc+PXkK=!cYcfcbjTZ(%kgl$r
zAV7?+uCp*uk{z2qTlz-H<8f83^>ySwvdu2Y6LYlgl!PFgG&`r*QMSH<0^HDL!eD6C
zW#SO>)H>qplW-qTv|j#|clW?978HqDRkl40M7F}}Y2bR!lt9XupbP<wi9^X-9J$<B
z2R*k@i~KXWr$Wrmy0F|9*|%wyffqSbg?wzNK?OF3k=I!f@Rcum343>3Y~r3ev2`iV
zbNrF5eBhb&gfk5=(qqDKaMfet2=W@nxTVFTm%j81zdr7bBxV{o+W#OjJHPJo!9B9|
z)Py8#jDlQjj3%#AIekwBdM=Ig){Wqv7BQ1Wqrz_?>)rTJc_e4r$@)yt0X=;t>XN2i
z=>H@SwUxUq^k2!&8i5g0+U&A>H8Klvd%ym_vT5i+BsTOR0UHM79nORqUFdZgoSzxY
zJwsxSchb{F;3>P%>($Ln&WxZD8^-Vs8z$r>`7@VnY}9LyuZ`!MV+^sD&${dqkSScV
zb=$?6DR>(&!3-h{m}pL(mn5oqXNZGzwq01j0e%>bCAPsb7MhTqkn29Zk24D>!-fRv
zv0+KxlA^MrswFs&n0`wy?pYDLT=b2T6J9ywLvO~aaApm5hD@*lPeZ0-i{8f*M;Q0X
zvK_>tV-IPDOmv{u9f#BE>3E6{nO9zA%3I@!O;GdKh{G#LTeQ@~gP&B6(2k7>plZa#
ziRA5VPTVpBy$gLcrM}#ABDSHbW7afe2i%=Bd^no~K}JjvAqE@H<OPk|t!s#$?Wr*P
z@!WGE)@oDTr;5y3r#!@fGgr8Qjmgl8jVa`5E{)!$jo$H#n+>eFH<j2`=d*2^$eIVA
zyKlys6r{#Xm<9pHOmrhpC3#MD!!ifyy>%~iUh?fRomf>}Lv<-K^+LTtw>g^u`Pi5V
z71)?Xp2AjVrJvAiS(5q9DelcCCK>ic>?PdZ>S69@`6X3w2O|?E%mG&uCVocV#?<F^
z1=w&&a@T0($C?MR!_Tu$h9mpo_p5Qk`6=ZIN!aj$Tx@(!o{M+pH4)c2Z0V2@zP+;Z
zW-c++lc{|!*eF)c*guXl@8mH|m<M`enD_;052JU~>*AqyApQ9KY(9<o#Kh++!-pVC
zj|%GC$Jv(<i47k}z=kh*?FH9+<k1UxIISv-dkcuwI=Y4qG+xz&X+Gemy&p7U<12WF
zjfLd7o0)j~<7OKq`EkD+-+lhXwm)m$S%oa_o>HD6X93`C%7j3OFlFK*@^U6uZasug
zC3{v(@jb(L%h$x3){HAVjO@LU%d;%bf}ji=i=p0>`2_#xN#32^jb4q*WgmO)g%ESU
z;N7?lnQ!kZ1xwDB5Yt~(6TJ&r?xh7m{4Ohmf~Of1!^m*Dyv*br8j<(f`uTH+@C~s@
z$A3J^kZH_26)4Zk;gDg*gr!h|jb-HhTb^I`0k_2LM>F@?a&I}Y3#+fpH^KY-h#A)(
zm~a*W8s<z`0oLYBTuENH&W6ZDY!n1L&)&uFkE@8)subsKMK)o?`K+CsMM5k#Rzn&#
z{zqPQZqCc?=vfurF4@MtHN>|4{=c|5WOpMxzS_!J6trVwEvSxV;yUs&8?Wd5h~CQE
zS3~2u_bssiuXx4t$W9&o@=XC}>mg_?6QUso8{d&vT5JAmEP9cnzi4&k-Ueb**v8I*
zzGO<pvnia#zzu9{gjQ^PPhM8Al1D8bp<b1y(TaS#{Xi^mY2|}~=hxJrjR!xnSddyU
zVG{&cFmW?^<E{7JDMrsOxI09hH{yudWMB6ifzKQ(Z9_KlXKEoH^0Bc6DzLGYyg4Du
zYhGhxr+l?>C!g<+#NN)D=J^iU$dWg&<#>M^7)hA09b6?$+(F*0nNq(zJn8@FF(1{%
z&%~X?PDAUZR6NFxK3W*OpEnX9Ny2<~k&#losPq^bfBH<a<`1R9Zel9)vaST-TBN@4
zd+?N(6N&k#cv~sr?4B#{dAy&qq-0Ab`~-TIOp;96s%w804ICJCMc3a<<tqrt=uWl=
zf^f`Uh_PfoDKy5|O!_7pr&M@2H&2IO3HK2@?zK3$9S?Z@D9scD&VD8~D}t@{!VRIc
zyrlagXZzs>_76a-B@<K0J8;$Wa3NknHyN%O6VAOfVqJ%n0;-VZI;PB6%h@j=wPM0S
z2(V&eI(he+lP6i>Jhqt6z4D5$R|c{2SHhm}aGmXsA5=8w>=5K*<5#G_MkaY9J6?L+
z!cAyn-_ZW?j(?cg+=SAzS;%?~QjE3vjynQI)=W4GuGUP<BCoGx-P{@IZK<{W>Eq?;
zH)0R{EfppY?4lc8H6Jfe#~=wC*^rBk9P)x58&=ApSL)Lf>cT%OmsqR&>3zz`CbUY+
zojE(6Y{P^Tpl8FxJkm=2%IfOy!A7A8UVMD8$tQMJPABm$vY)?~*PY7~1rUjilaPRo
z-^mko<Wl#b*XEvjb20Z$5nH~oe_s-^%B5Lf2Xj^kjo3I1@33)(yduAXALpVsQpqT8
z759pWbqLc>%|fP{c))HoXT{)c%Y?HKVavon$h+#)5<l=Tx2&$?EpV@dSa`=D+v|}{
zZQtOT!dWSlVdEUsW8+WqBqt3L)6u)+_H)h&?v)X9`rCK^24o?3T|EBg>^#_wW5NaS
z9LL0q<khZn8|sH%<jLFfo4I$1nCH~AC0`;_Pm4P8g0sIM0~?p21RLe#jkeTN8jjvw
z1%vsf{4RQhm}|KHWHn^dE>>q)aP~K7*fHTMSlco2AM$pezOd;jehX_zl^8GMUInqg
z${pW4LZ;{P?V%N%U4vL`T!%DlRFXIQlHH*7=xNT3IhV=38^k&zRkK$j6OQ&}9^tGC
z+Obg$s`gC0NuJXCKlJ3$8#!&<%na_`B4&THUZn@W2t*rv-<!_aZ3wbw!X1dgMh$t(
zFJF<%LocPH<iL6E{rCGu_><se*~sGOyT)GRtQKxy;~unPqmCNGGbP#9=+$=^R6XY2
zf4^^dmLFaH7EhNK=XM0%<EMTDNFA7P9|9bh_<$M~Fw4{wudIEij8%T-UL&#c;1!R}
zkgc(QeQz&k4<R2LO;CZ2N92uFSYWvfy}j`*i6Pt@_>DvMeONQ}j(P;Lp1qdgVVpey
zqw!353a;as*i7EIh}Tc+(K{^qjsKN<&xqN-Jldm+m*HE*H&0*S>^UT1;|1hmqlLVA
zO~*1%;H7ZhZvpF@xz|ce^GNa39=sH~pIA7lpR=}PM<%=kJx3<KB5h7#i^?xJ4ZEtr
zRiAOKomf`Y=9t;Yid5Q7+&Fs;k=W>f1Z;GYS6X0m=n`)F<L%o#>bUpjKXxU@(Ggjc
zlhImLe!6r)BR1Z`J8b+*UaP(F<sv-93MY+D`i}3~ZekgQ1_5Qr);0}$xrwtL@Sebg
zUWk~$#6I#|9WwN^@bHMbp5yYIdjmgu$ac%@gq@1I$kfcdj<s_39?G!M5B1piK;A<K
z-N|M6om6X5Pqw1$0a|v$lr=UL_Zpl*R&qdpt}<r=*iF=xlam9_iMq~m@>H=2yL06@
znn%1w-t^(70<lutG>aT$t6UES`EfQFGA1%%2$W1@q9S>jXTH0?9q*|pEWBSGm2Fiy
zC1S&pd<T7vOk?qw^3$9tgN73mhJv*d6IIB&xl*oWD0+35H%KbEr%LSFO6iLGI1fLy
z72nJAd8k1wHikhOHq^=c+q*s278^4zdfwhC+k<i%#ESC0@Au*XIA(bH=W96|4(-?&
z0jiUjFcPF96Eq<JUq?X@zB3wP@Kp=)@f~fbz*il(f$!)-E50%?a%O@axZ<n6Y^;H7
etf6eIk!-B7Y^;fF>=@ZtQ`uNE*;sQNtNnjV|48is

diff --git a/GIS Base Map/marshal_positions.shx b/GIS Base Map/marshal_positions.shx
index fe953b059ac3acb7cd2ec1d8767dc8b648c2cb8c..67187670a8891f5d3b340e4740b02650b5a5de67 100644
GIT binary patch
literal 4516
zcmZwGab%Zy9Ki9l-?P=#uczmEZq;tLx=FfBl1Y+elF1}VCh3yNbV(*jmt<y=B$*`1
zOp+v%B*|owWRfn)F3Dsj$)uZfncVZe=k?Fg{(0^D{r#Tr@9Xpa{VFPcomuhSzZuWp
zl`1Nx<*!}(^N(NV>~3oA_`N!7``SG8PgmV<E&H3A+v*1YTKsqO(03pI|7KIZ44>1?
z&D_a-Ji-$^$IHCQ`+UMze8<m)(;{YU;Bu~IE4Q<QhuF=t?BfmI<72+$7(W$O=7c#^
z#;j)}SF?rN*v`(}{E*7S);;WHKL<F-VUBP-H=Of<;eKKLrFgwm&6;ArRA;@EtGIz%
zxjQ#MrxfNF+;9J=br(<A*SB=pTHlhsC4Ec!mh>&@8|fQm#q&`E^^Nq6^o{h5!u|3N
zk-ky4wZ4(Qk-m|>k-m|>k-kxwUw&Ry&VTA#rEgWEeSNE1to5yGw+?;7ImdaL7kQ0$
z_>j*z$_Y*tR_AAibE|8)ge$q8Teyq*Rfm4z`I9`)E4;-aKILn^r|;MF>S8^;hKsm@
z>$r(KxR;07!(R4tfP)<72*){DIHQsY7jhZba3kBehX>ikGrYv>yvs*?!MFU#Z-qaU
zS;wVZ#SPrb-8{f!JjDyV%G-RvXMDpC{8~732Ip}xo7l|F+{t}B!V^5l%e=|^xp|YB
z53QebloOmPoHdiRx%qRm^qUp>g>|@JaJBcfa2wm%nH%2c`!%b_elPnuz(EdkgyXs4
zoG`!Or(!?k48Nmt%z8G`{mSlFcE7UwmBanQ^T&Cb7kQ0$Xntk$E05X_^ULp5o@D5o
zuV?3k^Jj<qg>?<X_b;p)a>MJ(xt6Wm&JG@8H_x(<H+YYa`I2Kazi_Sa`EmFsXnt{{
zwfV*77n@()?sfBv%`Y~;*!*Jii_I@Kzu5fZQRhr>s&GzzmvEmswOqoLT+c1s#r-_W
zlRVEWyp@~Jf6iUrxBrB%_>P|olZY7`s9&OA(rRD7M88D8M88D8M88D8M88D8M88D8
zM87oum@ubQzf`}p(Y}7EeyM(`eyM(`eyM(`eyM(`eyM(`e(9*s(J$36%kLEKmFbu1
zm+6=3m+6=3m+6=3m+6<Ccb<M(=oii(;#0ondwwbWv6?kp#1&k}P29n~Jj@>UvY!JS
z<S<7#&dI`>N+w*$Wn9CJY~vmtWEaoy60h?vAMpj>@*}?$&MmW!OLOzP&RuT3maW{*
z4jy7R&$5p<c#n_yl4JZ-I4>u3o)@#8ja<zZZeu$;d7P(tk=J;K5BZ#<oZwX9{QOSg
zUh`|Yge$q8Teyq+d6Xx4o>zE_Lww5De9te1wbiWQBCg;%ZsHE^<ze=)m;D^zAcr}^
zaZVQgRLO)3xr}SLk!{?=gY4oNUgCA$<s-h}TYluX!n!i+xRk57fm^wo2Y8I9c!5`W
zn-BPmZ}@><3xA%$d0fmUHghv~avzWI1kdp@Z}L8$@D<<jb76hNj164QwQS{fcJL6p
md6s>=!FznnmmK4#!UZ|uceWsAJsY{2E!@U-cJeq+2mb}$#8P<x

literal 4500
zcmZwFab(tc9Ki9_^V{0>Y`;CvueICls!L{<B$=5cc}ylrl9{B-OwuJuk}k<4Ns=T<
zl1Y*zNs>$^Nhaws>5@#6OeS5@O>*Dw{a*hZJ^#FXzt8i0e_x;Xud3?T=~dtT)Q-F>
zR8>t0-<|vOk6#-4+ACXrugQ8RE5rW`wEWh+y}i=gGW1vL-<9F-{{8=(?O_?8Q{ftJ
z<Tmc*VV>dzUgupt;tRgx=iDg?GtT8AF5@b$=N9hfL7w1wUgaG=<TJkE$K0ubIESez
zXK?|Su$w*X=gwd_Wa=L4Lp;erUgHo)_?&Np@tpUJ_lxT<`S*nyHs<?<7VG)!<O;51
zUof0gi1UkXx4+MNfQRktTex7YZ$aOJz6E^?`WEy}^i8t-|H)kHo9LV9o9LUw`-KjP
zzR5vreG`2XeG`2XeG`2XeUmu9a9(xbKlQEFw|aqneXF~z^{wu=j(y`f2Y8HUd6~C(
zpHDf)34YD331`N0Yns`{4t8-ZH&MTu*f0M72v74OZ*Z88`I6)Geod>%*V7s~kBhmS
ztGR(&xrc{%l7qa)A&&4l-||y#?NpXHhYPusE7{A<+{FPN=Q&>CZ9d>AU-JXM<^E8|
z7S3lUS8yHsxP$w7lxKK}H+hdw_=@j2nLE9fO>AX5D_p~k+{V2;%u~F;>%1EbO{U+s
ze#$XU@M~^yI-7&xe?|R@v0q%r`$d=dT{nB!?|bi8F}`2%_vTkLzoPjS&97*F#e07L
zkdHYU40kKOroKge>tf&VoVtwh{^9p^ZR}td*K!lLb03fJG%xZ7hZ*k|pYxLA{E}N=
z!^U8^UwwT4qI2nf_3?gje<>^M4u<pVd)UvNJiuc-%gek){p<CwAG5E2z5Z!<R(xJ+
zeyRJV=9hN)-uzPYOU*AeztsFv^GnSyHNSM&Ip&v|Upj8z{2I)!A<i${t6?4&b2(RY
z1Gh51fAN2Zc#?y>#vzXIc`)>7c*QsNKjxMK@!V3%SzN#+)UTvpNxzbQCH+eJmGmp=
zSJJPfUrE2xnDg~3=~oVSiuWq(SJtnrUs=Dher5g2`jz!7>sQvVtY2Bb^04RVSJtmQ
zZePDlzf8YOzf8YOzf8YOzf8YOzf8YOzicpnPNrX`Up8Vt_6u{!-ttrKjL<ah&xiq|
zbGVR8xstuy%v~Jdah~H9-sS_2@-;v3TW(_=TR5McT)}nh;|}iUQJ&!?-sC+#;VZu9
zWbVvbHnElMtZ+>*%yedtbw79V0FUu3FY^}f^C`zT!LPYZp;_$K)XX+^u#0QCiQBo4
zM|heSd4t1z%$FSJm)sv~*vNTY%;j9o4cy8-Jj9b6<TVa)gwOewpK_Z+i#VU=66bIs
zmvSY0xtY5-z~el}E4<AI9OY|%;J4hL>e#~h?BoirV;^^LKacVZFYzYt@d;n?JtuQp
zYT3kAwzI-D+{kU*%fmdy3%t&|e8d-g$IrPxC(JmPi@1!dxSm_Mn+JJ<=XsTP_>j-|
zh97fh1>$=&D`nh>>jhlGZuYRBJ9&V|c$SxWi}(4IW1QgE+}Ys{@gB3A*~Sibac%Tp
Dy-rd{