From 714a321b35450205eed53468db65a7359dbd50a4 Mon Sep 17 00:00:00 2001
From: tim <tim@treehouse.org.za>
Date: Mon, 12 Sep 2022 08:36:39 +0200
Subject: [PATCH] Fix marshal plan outlines

---
 GIS Base Map/Gun Run.qgs           | 6148 +++++++++++++--------------
 GIS Base Map/Gun Run.qgs~          | 6161 ++++++++++++++--------------
 GIS Base Map/marshal overviews.dbf |  Bin 622 -> 622 bytes
 GIS Base Map/marshal overviews.shp |  Bin 1460 -> 1460 bytes
 GIS Base Map/marshal overviews.shx |  Bin 180 -> 180 bytes
 5 files changed, 6157 insertions(+), 6152 deletions(-)

diff --git a/GIS Base Map/Gun Run.qgs b/GIS Base Map/Gun Run.qgs
index f2b4b04..860c204 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="2022-09-11T23:08:07" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen">
+<qgis saveDateTime="2022-09-12T08:34:14" projectname="Gun Run" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,11 +21,11 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" groupLayer="" name="Marshals" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Marshals" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" expanded="1" name="marshal_positions" legend_exp="" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" expanded="1" providerKey="ogr" name="marshal_positions" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshal_positions [460]" type="QString"/>
@@ -36,26 +36,26 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" providerKey="ogr" expanded="1" name="extra_security" legend_exp="" patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0" expanded="1" providerKey="ogr" name="extra_security" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" providerKey="delimitedtext" expanded="1" name="marshals_by_position" legend_exp="" patch_size="0,0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0" expanded="1" providerKey="delimitedtext" name="marshals_by_position" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshals_by_position" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" expanded="1" name="complete_marshal_overview" legend_exp="" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" expanded="1" providerKey="virtual" name="complete_marshal_overview" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" expanded="0" name="marshal_overviews" legend_exp="" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" expanded="0" providerKey="ogr" name="marshal_overviews" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="legend/expressionFilter" value="" type="QString"/>
@@ -64,11 +64,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Fencing and Cones" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Fencing and Cones" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" name="fencing" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="fencing" type="QString"/>
@@ -78,21 +78,21 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" expanded="1" name="fence_groups" legend_exp="" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" expanded="1" providerKey="virtual" name="fence_groups" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" groupLayer="" name="Markers" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" providerKey="memory" expanded="1" name="route_markers" legend_exp="" patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={84131c94-5de5-48de-82a7-537bc489c533}" checked="Qt::Checked" legend_split_behavior="0">
+        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={ec24be51-a272-427e-8ee9-16cf66eedb24}" checked="Qt::Checked" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" patch_size="-1,-1" expanded="1" providerKey="memory" name="route_markers" legend_split_behavior="0" legend_exp="">
           <customproperties>
             <Option type="Map">
               <Option name="cached_name" value="route_markers" type="QString"/>
@@ -100,7 +100,7 @@
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="all_routes" type="QString"/>
@@ -110,18 +110,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" expanded="0" name="timelapse" legend_exp="" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" legend_split_behavior="0">
+    <layer-tree-layer source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" expanded="0" providerKey="ogr" name="timelapse" legend_split_behavior="0" legend_exp="">
       <customproperties>
         <Option type="Map">
           <Option name="cached_name" value="timelapse" type="QString"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" groupLayer="" name="Feeding Stations" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" providerKey="ogr" expanded="1" name="water_tables" legend_exp="" patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0" expanded="1" providerKey="ogr" name="water_tables" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="water_tables" type="QString"/>
@@ -130,18 +130,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" groupLayer="" name="Ask Me" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" expanded="1" name="poi_labels" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="poi_labels" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" expanded="1" name="directions_to_start" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="directions_to_start" type="QString"/>
@@ -149,18 +149,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" groupLayer="" name="Residents Access" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" expanded="1" name="mayor" legend_exp="" patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./mayor.shp" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="mayor" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="mayor" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" expanded="1" name="viplabels" legend_exp="" patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./viplabels.shp" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" expanded="1" providerKey="ogr" name="viplabels" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="viplabels" type="QString"/>
@@ -168,7 +168,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" expanded="1" name="vipaccess" legend_exp="" patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./vipaccess.shp" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="vipaccess" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="vipaccess" type="QString"/>
@@ -176,12 +176,12 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" expanded="0" name="golfaccess" legend_exp="" patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./golfaccess.shp" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" expanded="0" providerKey="ogr" name="golfaccess" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" expanded="1" name="residents_access_roads" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="residents_access_roads" type="QString"/>
@@ -189,17 +189,17 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" expanded="1" name="residents_access" legend_exp="" patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="OSM data" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" expanded="0" name="osm_roads" legend_exp="" patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" expanded="0" providerKey="ogr" name="osm_roads" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
@@ -208,7 +208,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" expanded="1" name="osm_places" legend_exp="" patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" expanded="1" providerKey="ogr" name="osm_places" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_places [7]" type="QString"/>
@@ -218,18 +218,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Start and Finish pages" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Start and Finish pages" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" expanded="1" name="data-comments" legend_exp="" patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" expanded="1" providerKey="ogr" name="data-comments" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" expanded="1" name="start_finish_area" legend_exp="" patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./start_finish_area.shp" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" expanded="1" providerKey="ogr" name="start_finish_area" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -237,11 +237,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" groupLayer="" name="Elevation" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Elevation" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" expanded="1" name="capetownelevation-1m" legend_exp="" patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" expanded="1" providerKey="ogr" name="capetownelevation-1m" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="showFeatureCount" value="1" type="QString"/>
@@ -249,11 +249,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Map" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" expanded="0" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" expanded="0" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
@@ -261,7 +261,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" expanded="1" name="Outlines" legend_exp="" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" expanded="1" providerKey="wms" name="Outlines" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="Outlines" type="QString"/>
@@ -298,31 +298,31 @@
       <item>route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="0" self-snapping="1" mode="3" unit="1" scaleDependencyMode="0" tolerance="10" minScale="0" type="1" maxScale="0" intersection-snapping="1">
+  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" scaleDependencyMode="0" enabled="0" type="1" minScale="0" unit="1" self-snapping="1" maxScale="0">
     <individual-layer-settings>
-      <layer-setting enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" units="1" tolerance="12" minScale="0" type="0" maxScale="0"/>
-      <layer-setting enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" tolerance="20" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="extra_security20170921130834191" units="2" tolerance="0" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="water_tables20170921142016467" units="2" tolerance="0" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" tolerance="12" minScale="0" type="0" maxScale="0"/>
-      <layer-setting enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="water_tables20170921142016467" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="extra_security20170921130834191" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -330,10 +330,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.40161633768571292</xmin>
-      <ymin>-33.90865669289104289</ymin>
-      <xmax>18.40994200790283131</xmax>
-      <ymax>-33.90429444055251906</ymax>
+      <xmin>18.38171185633030547</xmin>
+      <ymin>-33.92253613496937703</ymin>
+      <xmax>18.43166587763301578</xmax>
+      <ymax>-33.89636262093823404</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -354,161 +354,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="Marshals" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Marshals">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="marshals_by_position" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="fencing" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="fencing" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_groups" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Routes" checked="Qt::Checked">
-      <legendgroup open="true" name="Markers" checked="Qt::Checked">
-        <legendlayer open="true" drawingOrder="-1" name="route_markers" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Routes">
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="0">
           <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" drawingOrder="-1" name="all_routes" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" drawingOrder="-1" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0">
       <filegroup open="false" hidden="false">
-        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" name="water_tables" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="mayor" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="mayor" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" name="osm_roads" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="osm_places" showFeatureCount="1" checked="Qt::Checked">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Map" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="Outlines" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="annotation">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -559,7 +559,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" type="raster" maxScale="100000">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="100000" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -624,7 +624,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -649,13 +649,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" zscale="1" band="1" symbology="Line">
+      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -664,7 +664,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -672,7 +672,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -740,7 +740,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -748,7 +748,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="152,125,183,255" type="QString"/>
@@ -804,9 +804,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer alphaBand="-1" redBand="1" opacity="0.5" nodataColor="" greenBand="2" type="multibandcolor" blueBand="3">
+        <rasterrenderer opacity="0.5" nodataColor="" greenBand="2" blueBand="3" type="multibandcolor" redBand="1" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -817,14 +817,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" colorizeStrength="100" colorizeOn="0" saturation="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" type="raster" maxScale="0">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -889,7 +889,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -912,13 +912,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" zscale="1" band="1" symbology="Line">
+      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -927,7 +927,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -935,7 +935,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1003,7 +1003,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1011,7 +1011,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="225,89,137,255" type="QString"/>
@@ -1067,9 +1067,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer alphaBand="-1" opacity="0.75" nodataColor="" band="1" type="singlebandcolordata">
+        <rasterrenderer opacity="0.75" nodataColor="" band="1" type="singlebandcolordata" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1080,14 +1080,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" colorizeStrength="100" colorizeOn="0" saturation="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1152,7 +1152,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1166,8 +1166,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="length_km" comment="" expression="$length * 100" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="length_m" comment="" expression="$length * 100 * 1000" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1180,13 +1180,13 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="RouteLen" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="RouteLen" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -1195,7 +1195,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1203,7 +1203,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1271,7 +1271,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1279,7 +1279,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="229,182,54,255" type="QString"/>
@@ -1315,7 +1315,7 @@
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1323,7 +1323,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -1375,25 +1375,25 @@
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" description="Only show when active in Atlas" label="Active Routes" checkstate="0">
-            <rule key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'" symbol="1" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0"/>
-            <rule key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'" symbol="2" description="This should be disabled, since it's only for legends" label="10KM" checkstate="0"/>
-            <rule key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'" symbol="3" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0"/>
-            <rule key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'" symbol="4" description="This should be disabled, since it's only for legends" label="Trail" checkstate="0"/>
+          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" checkstate="0" symbol="0" description="Only show when active in Atlas" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
+            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="1" description="This should be disabled, since it's only for legends" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
+            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="2" description="This should be disabled, since it's only for legends" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
+            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="3" description="This should be disabled, since it's only for legends" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="4" description="This should be disabled, since it's only for legends" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
           </rule>
-          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" label="Show by day">
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" symbol="6" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0"/>
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" symbol="7" description="This should be disabled, since it's only for legends" label="10KM" checkstate="0"/>
-            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" symbol="8" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0"/>
-            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" symbol="9" description="This should be disabled, since it's only for legends" label="Trail" checkstate="0"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="6" description="This should be disabled, since it's only for legends" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="7" description="This should be disabled, since it's only for legends" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="8" description="This should be disabled, since it's only for legends" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="9" description="This should be disabled, since it's only for legends" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="10" label="Always show" checkstate="0"/>
-          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" label="Always show by day" checkstate="0"/>
+          <rule checkstate="0" symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="11" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1401,7 +1401,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1454,7 +1454,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1462,7 +1462,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,0,0,255" type="QString"/>
@@ -1496,7 +1496,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@0@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@0@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1504,7 +1504,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -1547,7 +1547,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1618,7 +1618,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1660,7 +1660,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1668,7 +1668,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1725,7 +1725,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1767,7 +1767,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1775,7 +1775,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1833,7 +1833,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1841,7 +1841,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1894,7 +1894,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1902,7 +1902,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -1936,7 +1936,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1944,7 +1944,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="210,32,39,255" type="QString"/>
@@ -1987,7 +1987,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2058,7 +2058,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2100,7 +2100,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2108,7 +2108,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2165,7 +2165,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2207,7 +2207,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2215,7 +2215,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2273,7 +2273,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="10" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="10" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2281,7 +2281,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2353,7 +2353,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="11" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="11" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2361,7 +2361,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2433,7 +2433,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2441,7 +2441,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2494,7 +2494,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2502,7 +2502,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -2536,7 +2536,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@2@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2544,7 +2544,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -2587,7 +2587,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2658,7 +2658,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2700,7 +2700,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2708,7 +2708,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2765,7 +2765,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2807,7 +2807,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2815,7 +2815,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2873,7 +2873,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2881,7 +2881,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2934,7 +2934,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2942,7 +2942,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="145,211,55,255" type="QString"/>
@@ -2976,7 +2976,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@3@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@3@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2984,7 +2984,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="145,211,55,255" type="QString"/>
@@ -3027,7 +3027,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3098,7 +3098,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3140,7 +3140,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3148,7 +3148,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3205,7 +3205,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3247,7 +3247,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3255,7 +3255,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3313,7 +3313,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3321,7 +3321,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3374,7 +3374,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@4@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@4@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3382,7 +3382,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,72,255,255" type="QString"/>
@@ -3416,7 +3416,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@4@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@4@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3424,7 +3424,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,72,255,255" type="QString"/>
@@ -3467,7 +3467,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3538,7 +3538,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3580,7 +3580,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@4@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@4@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3588,7 +3588,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3645,7 +3645,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3687,7 +3687,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@4@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@4@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3695,7 +3695,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3753,7 +3753,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="5" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3761,7 +3761,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3814,7 +3814,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@5@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@5@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3822,7 +3822,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,0,0,255" type="QString"/>
@@ -3856,7 +3856,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@5@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@5@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3864,7 +3864,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -3907,7 +3907,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3978,7 +3978,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4020,7 +4020,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@5@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@5@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4028,7 +4028,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4085,7 +4085,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4127,7 +4127,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@5@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@5@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4135,7 +4135,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4193,7 +4193,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="6" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="6" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4201,7 +4201,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4254,7 +4254,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@6@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@6@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4262,7 +4262,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -4296,7 +4296,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@6@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@6@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -4304,7 +4304,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="210,32,39,255" type="QString"/>
@@ -4347,7 +4347,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4418,7 +4418,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4460,7 +4460,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@6@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@6@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4468,7 +4468,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4525,7 +4525,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4567,7 +4567,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@6@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@6@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4575,7 +4575,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4633,7 +4633,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="7" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="7" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4641,7 +4641,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4694,7 +4694,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@7@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@7@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4702,7 +4702,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -4736,7 +4736,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@7@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@7@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -4744,7 +4744,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -4787,7 +4787,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4858,7 +4858,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4900,7 +4900,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@7@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@7@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4908,7 +4908,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4965,7 +4965,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5007,7 +5007,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@7@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@7@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5015,7 +5015,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5073,7 +5073,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="8" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="8" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5081,7 +5081,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5134,7 +5134,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@8@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@8@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5142,7 +5142,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="145,211,55,255" type="QString"/>
@@ -5176,7 +5176,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@8@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@8@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5184,7 +5184,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="145,211,55,255" type="QString"/>
@@ -5227,7 +5227,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5298,7 +5298,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5340,7 +5340,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@8@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@8@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5348,7 +5348,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5405,7 +5405,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5447,7 +5447,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@8@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@8@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5455,7 +5455,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5513,7 +5513,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="9" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="9" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5521,7 +5521,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5574,7 +5574,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@9@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@9@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5582,7 +5582,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,72,255,255" type="QString"/>
@@ -5616,7 +5616,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@9@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@9@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5624,7 +5624,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,72,255,255" type="QString"/>
@@ -5667,7 +5667,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5738,7 +5738,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5780,7 +5780,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@9@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@9@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5788,7 +5788,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5845,7 +5845,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5887,7 +5887,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@9@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@9@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5895,7 +5895,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5960,14 +5960,14 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="round($length / 1000, 0)" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round($length / 1000, 0)" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5975,7 +5975,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -6025,7 +6025,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6033,7 +6033,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -6079,7 +6079,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6089,9 +6089,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="km_marker()" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="1" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="1" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="km_marker()" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6142,7 +6142,7 @@
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -6180,12 +6180,12 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6193,7 +6193,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -6262,7 +6262,7 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6271,7 +6271,7 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6394,83 +6394,83 @@
         </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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="Sort" index="8" name=""/>
+        <alias field="day" index="9" name=""/>
+        <alias field="length_km" index="10" name=""/>
+        <alias field="length_m" index="11" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="descriptio" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="timestamp" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="begin" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="end" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Source" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Sort" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_km" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_m" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="length_km" comment="" expression="$length * 100" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="length_m" comment="" expression="$length * 100 * 1000" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column name="Name" hidden="0" width="152" type="field"/>
-          <column name="descriptio" hidden="0" width="-1" type="field"/>
-          <column name="timestamp" hidden="0" width="-1" type="field"/>
-          <column name="begin" hidden="0" width="163" type="field"/>
-          <column name="end" hidden="0" width="-1" type="field"/>
-          <column name="Distance" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="RouteLen" hidden="0" width="-1" type="field"/>
-          <column name="Source" hidden="0" width="-1" type="field"/>
-          <column name="length_m" hidden="0" width="188" type="field"/>
-          <column name="Sort" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="length_km" hidden="0" width="266" type="field"/>
+          <column width="152" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="163" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="188" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" name="Sort" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="266" hidden="0" name="length_km" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6548,7 +6548,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6621,13 +6621,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6636,7 +6636,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6644,7 +6644,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -6712,7 +6712,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6720,7 +6720,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="196,60,57,255" type="QString"/>
@@ -6756,7 +6756,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6764,7 +6764,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -6816,9 +6816,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6826,7 +6826,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -6906,7 +6906,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6936,30 +6936,30 @@ 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 field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="ID" expression=""/>
-        <default applyOnUpdate="0" field="height" expression=""/>
-        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default field="ID" applyOnUpdate="0" expression=""/>
+        <default field="height" applyOnUpdate="0" expression=""/>
+        <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="ID" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="height" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="elevation" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="ID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="height" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="elevation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6982,18 +6982,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Polygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews</datasource>
@@ -7057,13 +7057,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7072,7 +7072,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7080,7 +7080,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7148,7 +7148,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7156,7 +7156,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="133,182,111,255" type="QString"/>
@@ -7192,7 +7192,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7200,7 +7200,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -7252,9 +7252,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7262,7 +7262,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="225,89,137,255" type="QString"/>
@@ -7310,7 +7310,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -7349,34 +7349,34 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="page" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7399,7 +7399,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7464,7 +7464,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7489,13 +7489,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7504,7 +7504,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7512,7 +7512,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7580,7 +7580,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7588,7 +7588,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="190,178,151,255" type="QString"/>
@@ -7624,7 +7624,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7632,7 +7632,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -7684,9 +7684,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7694,7 +7694,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7766,12 +7766,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="Name" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="Name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -7779,7 +7779,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -7814,7 +7814,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7824,9 +7824,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="LineGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="LineGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -7846,7 +7846,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -7874,12 +7874,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7887,7 +7887,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -7956,7 +7956,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7965,7 +7965,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7988,30 +7988,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Name"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Name" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="Name" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8056,7 +8056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8121,7 +8121,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8146,13 +8146,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -8161,7 +8161,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8169,7 +8169,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8237,7 +8237,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8245,7 +8245,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="145,82,45,255" type="QString"/>
@@ -8281,7 +8281,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8289,7 +8289,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -8341,14 +8341,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" label="21KM"/>
-          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" label="10KM"/>
-          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" label="5KM"/>
+          <rule filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8356,7 +8356,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8398,7 +8398,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8406,7 +8406,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -8457,7 +8457,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8510,7 +8510,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8518,7 +8518,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -8552,7 +8552,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@0@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@0@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8560,7 +8560,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="210,32,39,255" type="QString"/>
@@ -8597,7 +8597,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -8663,7 +8663,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8671,7 +8671,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8724,7 +8724,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8732,7 +8732,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8766,7 +8766,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8774,7 +8774,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8811,7 +8811,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8864,7 +8864,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8872,7 +8872,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8906,7 +8906,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8914,7 +8914,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8951,7 +8951,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -9017,7 +9017,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9025,7 +9025,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -9078,7 +9078,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9086,7 +9086,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9120,7 +9120,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@2@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9128,7 +9128,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9165,7 +9165,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -9218,7 +9218,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9226,7 +9226,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9260,7 +9260,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@2@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@2@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9268,7 +9268,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9305,7 +9305,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -9390,12 +9390,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9403,7 +9403,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -9472,7 +9472,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9481,7 +9481,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9507,30 +9507,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Distance" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Distance" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="id" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9593,7 +9593,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9666,13 +9666,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9681,7 +9681,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9689,7 +9689,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -9757,7 +9757,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9765,7 +9765,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -9801,7 +9801,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9809,7 +9809,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -9861,9 +9861,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="0.796078" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.796078" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9871,7 +9871,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -9933,14 +9933,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="8" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9948,7 +9948,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -9989,7 +9989,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -10025,9 +10025,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="8" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="1" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="8" geometryGeneratorEnabled="0" placement="1" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10078,7 +10078,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -10092,14 +10092,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="4" forcedBold="0" textColor="227,0,185,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="4" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="227,0,185,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -10107,7 +10107,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -10148,7 +10148,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -10169,9 +10169,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1" zIndex="2" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10207,7 +10207,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -10371,12 +10371,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10384,7 +10384,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -10453,7 +10453,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="10" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="10" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10462,7 +10462,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10501,35 +10501,35 @@ 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 field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="position" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10605,7 +10605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Polygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10680,13 +10680,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10695,7 +10695,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10703,7 +10703,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -10771,7 +10771,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10779,7 +10779,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="164,113,88,255" type="QString"/>
@@ -10815,7 +10815,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10823,7 +10823,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10875,9 +10875,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10885,7 +10885,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,85,0,255" type="QString"/>
@@ -10939,12 +10939,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10952,7 +10952,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -11021,7 +11021,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="1" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -11030,7 +11030,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -11087,50 +11087,50 @@ 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 index="5" name="" field="fence_len"/>
+        <alias field="name" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
+        <alias field="cone_len" index="4" name=""/>
+        <alias field="fence_len" index="5" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="group" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="cone_len" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="fence_len" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="name" hidden="0" width="415" type="field"/>
-          <column name="group" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="cone_len" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="fence_len" hidden="0" width="-1" type="field"/>
+          <column width="415" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="cone_len" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="fence_len" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11187,7 +11187,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11252,7 +11252,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11266,26 +11266,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="cone_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" readOnly="0" minScale="1e+08" labelsEnabled="1" simplifyDrawingHints="1" version="3.8.3-Zanzibar" simplifyAlgorithm="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" maxScale="0" simplifyLocal="1">
+          <qgis simplifyLocal="1" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyAlgorithm="0" version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyDrawingTol="1" readOnly="0" minScale="1e+08" maxScale="0" simplifyDrawingHints="1" styleCategories="AllStyleCategories">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" symbollevels="1" enableorderby="0" type="RuleRenderer">
+            <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="0" type="line">
-                  <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+                <symbol force_rhr="0" clip_to_extent="1" name="0" alpha="1" type="line">
+                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -11315,17 +11315,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 fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.8" multilineHeight="1" previewBkgrdColor="#ffffff" fieldName="comment" fontSize="11" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" fontFamily="Myriad Pro" fontCapitals="0" isExpression="0" fontSizeUnit="Point">
-                      <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                      <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="0.6" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOpacity="0.6" shapeOffsetX="0" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile=""/>
-                      <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowDraw="0" shadowRadiusAlphaOnly="0"/>
+                    <text-style isExpression="0" fontCapitals="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="11" fontItalic="0" fontUnderline="0" textOpacity="0.8" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
+                      <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                      <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeOpacity="0.6" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" formatNumbers="0" placeDirectionSymbol="0" addDirectionSymbol="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" placementFlags="2" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="5" priority="5" repeatDistance="0" geometryGeneratorType="PointGeometry" xOffset="0" placement="4" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" centroidWhole="0" geometryGenerator="" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering scaleVisibility="0" mergeLines="1" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="1" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
+                    <placement repeatDistanceUnits="MM" placementFlags="2" dist="5" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11346,17 +11346,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 fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" previewBkgrdColor="#ffffff" fieldName="round( $length, 1) || 'm'" fontSize="12" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" fontFamily="Myriad Pro" fontCapitals="0" isExpression="1" fontSizeUnit="Point">
-                      <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                      <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeOffsetX="0" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile=""/>
-                      <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowDraw="0" shadowRadiusAlphaOnly="0"/>
+                    <text-style isExpression="1" fontCapitals="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'" fontWeight="63" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="12" fontItalic="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
+                      <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                      <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeOpacity="1" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" formatNumbers="0" placeDirectionSymbol="0" addDirectionSymbol="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" placementFlags="15" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" priority="5" repeatDistance="0" geometryGeneratorType="PointGeometry" xOffset="0" placement="2" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" centroidWhole="0" geometryGenerator="" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
+                    <placement repeatDistanceUnits="MM" placementFlags="15" dist="1" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="0" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11380,21 +11380,21 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property key="dualview/previewExpressions" value="id"/>
-              <property key="embeddedWidgets/count" value="0"/>
+              <property value="id" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" penColor="#000000" scaleDependency="Area" penAlpha="255" minScaleDenominator="0" backgroundColor="#ffffff" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" height="15" rotationOffset="270">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" height="15" minimumSize="0" lineSizeType="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" rotationOffset="270" backgroundColor="#ffffff" diagramOrientation="Up" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute color="#000000" field="" label=""/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" dist="0" priority="0" zIndex="0">
+            <DiagramLayerSettings showAll="1" priority="0" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
               <properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11403,7 +11403,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -11487,81 +11487,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 field="id" index="0" name=""/>
+              <alias field="group" index="1" name=""/>
+              <alias field="comment" index="2" name=""/>
+              <alias field="moveable" index="3" name=""/>
+              <alias field="type" index="4" name=""/>
+              <alias field="name" index="5" name=""/>
+              <alias field="hidden" index="6" name=""/>
+              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
+              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
+              <alias field="fence_len" index="9" name=""/>
+              <alias field="cone_len" index="10" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" field="id" expression=""/>
-              <default applyOnUpdate="0" field="group" expression=""/>
-              <default applyOnUpdate="0" field="comment" expression=""/>
-              <default applyOnUpdate="0" field="moveable" expression=""/>
-              <default applyOnUpdate="0" field="type" expression=""/>
-              <default applyOnUpdate="0" field="name" expression=""/>
-              <default applyOnUpdate="0" field="hidden" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positiony" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positionx" expression=""/>
-              <default applyOnUpdate="0" field="fence_len" expression=""/>
-              <default applyOnUpdate="0" field="cone_len" expression=""/>
+              <default field="id" applyOnUpdate="0" expression=""/>
+              <default field="group" applyOnUpdate="0" expression=""/>
+              <default field="comment" applyOnUpdate="0" expression=""/>
+              <default field="moveable" applyOnUpdate="0" expression=""/>
+              <default field="type" applyOnUpdate="0" expression=""/>
+              <default field="name" applyOnUpdate="0" expression=""/>
+              <default field="hidden" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+              <default field="fence_len" applyOnUpdate="0" expression=""/>
+              <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="group" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="comment" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="moveable" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="hidden" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="fence_len" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="cone_len" notnull_strength="0" unique_strength="0" constraints="0"/>
+              <constraint field="id" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="group" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="comment" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="moveable" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="type" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="name" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="hidden" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="fence_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="cone_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint field="id" desc="" exp=""/>
+              <constraint field="group" desc="" exp=""/>
+              <constraint field="comment" desc="" exp=""/>
+              <constraint field="moveable" desc="" exp=""/>
+              <constraint field="type" desc="" exp=""/>
+              <constraint field="name" desc="" exp=""/>
+              <constraint field="hidden" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
+              <constraint field="fence_len" desc="" exp=""/>
+              <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" subType="0" name="fence_len" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" type="6"/>
-              <field typeName="double precision" subType="0" name="fence_len" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" type="6"/>
-              <field typeName="double precision" subType="0" name="cone_len" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" type="6"/>
+              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" precision="0"/>
+              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" precision="0"/>
+              <field typeName="double precision" name="cone_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" precision="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
               <columns>
-                <column name="id" hidden="0" width="-1" type="field"/>
-                <column name="group" hidden="0" width="-1" type="field"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column name="comment" hidden="0" width="223" type="field"/>
-                <column name="moveable" hidden="0" width="-1" type="field"/>
-                <column name="type" hidden="0" width="-1" type="field"/>
-                <column name="name" hidden="0" width="414" type="field"/>
-                <column name="hidden" hidden="0" width="-1" type="field"/>
-                <column name="fence_len" hidden="0" width="-1" type="field"/>
-                <column name="cone_len" hidden="0" width="-1" type="field"/>
-                <column name="auxiliary_storage_labeling_positiony" hidden="1" width="-1" type="field"/>
-                <column name="auxiliary_storage_labeling_positionx" hidden="1" width="-1" type="field"/>
+                <column width="-1" hidden="0" name="id" type="field"/>
+                <column width="-1" hidden="0" name="group" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" hidden="0" name="comment" type="field"/>
+                <column width="-1" hidden="0" name="moveable" type="field"/>
+                <column width="-1" hidden="0" name="type" type="field"/>
+                <column width="414" hidden="0" name="name" type="field"/>
+                <column width="-1" hidden="0" name="hidden" type="field"/>
+                <column width="-1" hidden="0" name="fence_len" type="field"/>
+                <column width="-1" hidden="0" name="cone_len" type="field"/>
+                <column width="-1" hidden="1" name="auxiliary_storage_labeling_positiony" type="field"/>
+                <column width="-1" hidden="1" name="auxiliary_storage_labeling_positionx" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11634,13 +11634,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -11649,7 +11649,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11657,7 +11657,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -11725,7 +11725,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11733,7 +11733,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="133,182,111,255" type="QString"/>
@@ -11769,7 +11769,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11777,7 +11777,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -11829,19 +11829,19 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps">
-            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones"/>
-            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences"/>
-            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences"/>
-            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" label="Is Visible"/>
-          <rule 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; )" symbol="4" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11849,7 +11849,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -11921,7 +11921,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11929,7 +11929,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -12001,7 +12001,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12009,7 +12009,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12081,7 +12081,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12089,7 +12089,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12161,7 +12161,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12169,7 +12169,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12235,7 +12235,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="5" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12243,7 +12243,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12313,14 +12313,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{c671f96e-2f37-4e60-9867-9a3746a7e824}">
-          <rule key="{cf092438-1d21-40b3-8218-4c8ef416cb6a}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cf092438-1d21-40b3-8218-4c8ef416cb6a}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.80000000000000004" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="comment" fontSize="11" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12328,7 +12328,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -12363,7 +12363,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -12384,9 +12384,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="14" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="5" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="1" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1.8200000000000001" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
+              <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="5" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8200000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12417,7 +12417,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -12431,14 +12431,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{8f0bbb62-12a0-4d1f-856f-8a119d5b6a26}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{8f0bbb62-12a0-4d1f-856f-8a119d5b6a26}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12446,7 +12446,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -12496,7 +12496,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12504,7 +12504,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -12539,7 +12539,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -12549,9 +12549,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="6" xOffset="0" placementFlags="14" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12587,7 +12587,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -12601,14 +12601,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{b2f2009a-4ab7-4a86-a46e-7b85998f4204}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{b2f2009a-4ab7-4a86-a46e-7b85998f4204}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12616,7 +12616,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -12666,7 +12666,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12674,7 +12674,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -12709,7 +12709,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -12719,9 +12719,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="6" xOffset="0" placementFlags="14" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12757,7 +12757,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -12789,12 +12789,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12802,7 +12802,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -12871,7 +12871,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -12880,7 +12880,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12959,74 +12959,74 @@ 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 field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
+        <alias field="day" index="7" name=""/>
+        <alias field="fence_len" index="8" name=""/>
+        <alias field="cone_len" index="9" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="comment" expression=""/>
-        <default applyOnUpdate="0" field="moveable" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="hidden" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default field="moveable" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="hidden" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="group" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="comment" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="moveable" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="hidden" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="fence_len" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="cone_len" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="comment" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="moveable" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="hidden" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="comment" desc="" exp=""/>
+        <constraint field="moveable" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="hidden" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="cone_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="group" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="comment" hidden="0" width="373" type="field"/>
-          <column name="moveable" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="692" type="field"/>
-          <column name="hidden" hidden="0" width="-1" type="field"/>
-          <column name="fence_len" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" hidden="0" name="comment" type="field"/>
+          <column width="-1" hidden="0" name="moveable" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="692" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="hidden" type="field"/>
+          <column width="-1" hidden="0" name="fence_len" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="cone_len" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13104,7 +13104,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13177,13 +13177,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13192,7 +13192,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13200,7 +13200,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13268,7 +13268,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13276,7 +13276,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="164,113,88,255" type="QString"/>
@@ -13312,7 +13312,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13320,7 +13320,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13372,9 +13372,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13382,7 +13382,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13466,12 +13466,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13479,7 +13479,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -13548,7 +13548,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13557,7 +13557,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13573,25 +13573,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
+        <alias field="id" index="0" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13634,18 +13634,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="100000" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </wgs84extent>
       <id>marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51</id>
       <datasource>./marshal overviews.shp|layername=marshal overviews</datasource>
@@ -13707,13 +13707,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13722,7 +13722,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13730,7 +13730,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13798,7 +13798,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13806,7 +13806,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="213,180,60,255" type="QString"/>
@@ -13842,7 +13842,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13850,7 +13850,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13902,9 +13902,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13912,7 +13912,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="26,0,201,255" type="QString"/>
@@ -13974,12 +13974,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13987,7 +13987,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -14056,7 +14056,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14071,7 +14071,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14117,40 +14117,40 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="page" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="page" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="page" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14197,7 +14197,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -14262,7 +14262,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14273,7 +14273,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" dynamicForm="0" editable="0" cascadedDelete="0" joinFieldName="position" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" customPrefix="csv_" hasCustomPrefix="1">
+        <join upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575" editable="0" dynamicForm="0" customPrefix="csv_" targetFieldName="position" memoryCache="0" cascadedDelete="0" joinFieldName="position" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14300,13 +14300,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="id" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="id" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14315,7 +14315,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14323,7 +14323,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -14391,7 +14391,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14399,7 +14399,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="114,155,111,255" type="QString"/>
@@ -14435,7 +14435,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14443,7 +14443,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14495,14 +14495,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" label="Show by day in marshal plan"/>
-          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" label="Always show in marshal plan"/>
-          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Show in marshal maps"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" checkstate="0" symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="2" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="0.8" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14510,7 +14510,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14560,7 +14560,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="0.8" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14568,7 +14568,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14618,7 +14618,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="0.01" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="0.01" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14626,7 +14626,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14680,14 +14680,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{02580e06-5c28-4087-a4e2-d2705453c9fb}">
-          <rule key="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14695,7 +14695,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -14745,7 +14745,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14753,7 +14753,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -14794,7 +14794,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14804,9 +14804,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1" zIndex="2" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -14842,7 +14842,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -14856,14 +14856,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14871,7 +14871,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -14921,7 +14921,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14929,7 +14929,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -14970,7 +14970,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14980,9 +14980,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1" zIndex="2" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15018,7 +15018,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15032,14 +15032,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.5" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.5" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15047,7 +15047,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -15088,7 +15088,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15139,9 +15139,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="8" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1.8" zIndex="5" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15207,7 +15207,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15221,14 +15221,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{91072baf-d72c-4be6-b15f-54994870beac}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{91072baf-d72c-4be6-b15f-54994870beac}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.59999999999999998" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.59999999999999998" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15236,7 +15236,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -15286,7 +15286,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15294,7 +15294,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -15335,7 +15335,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15345,9 +15345,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="8" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1.8" zIndex="5" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15413,7 +15413,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15427,14 +15427,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="8" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.90000000000000002" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOpacity="0.90000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15442,7 +15442,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -15492,7 +15492,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15500,7 +15500,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,0,255" type="QString"/>
@@ -15541,7 +15541,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15551,9 +15551,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1.8" zIndex="10" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15619,7 +15619,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15650,6 +15650,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
           <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
@@ -15794,12 +15795,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15807,7 +15808,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -15876,7 +15877,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -15885,7 +15886,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16010,90 +16011,90 @@ 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="xyposition"/>
-        <alias index="5" name="" field="day"/>
-        <alias index="6" name="" field="csv_position"/>
-        <alias index="7" name="" field="csv_club"/>
-        <alias index="8" name="" field="csv_firstname"/>
-        <alias index="9" name="" field="csv_surname"/>
-        <alias index="10" name="" field="csv_days"/>
-        <alias index="11" name="" field="csv_first_runner"/>
-        <alias index="12" name="" field="csv_last_runner"/>
-        <alias index="13" name="" field="csv_instructions"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="notes" index="3" name=""/>
+        <alias field="xyposition" index="4" name=""/>
+        <alias field="day" index="5" name=""/>
+        <alias field="csv_position" index="6" name=""/>
+        <alias field="csv_club" index="7" name=""/>
+        <alias field="csv_firstname" index="8" name=""/>
+        <alias field="csv_surname" index="9" name=""/>
+        <alias field="csv_days" index="10" name=""/>
+        <alias field="csv_first_runner" index="11" name=""/>
+        <alias field="csv_last_runner" index="12" name=""/>
+        <alias field="csv_instructions" index="13" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="notes" expression=""/>
-        <default applyOnUpdate="0" field="xyposition" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="csv_position" expression=""/>
-        <default applyOnUpdate="0" field="csv_club" expression=""/>
-        <default applyOnUpdate="0" field="csv_firstname" expression=""/>
-        <default applyOnUpdate="0" field="csv_surname" expression=""/>
-        <default applyOnUpdate="0" field="csv_days" expression=""/>
-        <default applyOnUpdate="0" field="csv_first_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_last_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_instructions" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="notes" applyOnUpdate="0" expression=""/>
+        <default field="xyposition" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="csv_position" applyOnUpdate="0" expression=""/>
+        <default field="csv_club" applyOnUpdate="0" expression=""/>
+        <default field="csv_firstname" applyOnUpdate="0" expression=""/>
+        <default field="csv_surname" applyOnUpdate="0" expression=""/>
+        <default field="csv_days" applyOnUpdate="0" expression=""/>
+        <default field="csv_first_runner" applyOnUpdate="0" expression=""/>
+        <default field="csv_last_runner" applyOnUpdate="0" expression=""/>
+        <default field="csv_instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="notes" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="xyposition" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_club" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_firstname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_surname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_days" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_first_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_last_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_instructions" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="notes" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="xyposition" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="xyposition" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="csv_position" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_firstname" exp="" desc=""/>
-        <constraint field="csv_surname" exp="" desc=""/>
-        <constraint field="csv_days" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="notes" desc="" exp=""/>
+        <constraint field="xyposition" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="csv_position" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_firstname" desc="" exp=""/>
+        <constraint field="csv_surname" desc="" exp=""/>
+        <constraint field="csv_days" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="position" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="notes" hidden="0" width="-1" type="field"/>
-          <column name="xyposition" hidden="0" width="-1" type="field"/>
-          <column name="csv_club" hidden="0" width="-1" type="field"/>
-          <column name="csv_first_runner" hidden="0" width="-1" type="field"/>
-          <column name="csv_last_runner" hidden="0" width="-1" type="field"/>
-          <column name="csv_firstname" hidden="0" width="-1" type="field"/>
-          <column name="csv_surname" hidden="0" width="-1" type="field"/>
-          <column name="csv_position" hidden="0" width="-1" type="field"/>
-          <column name="csv_days" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="csv_instructions" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="notes" type="field"/>
+          <column width="-1" hidden="0" name="xyposition" type="field"/>
+          <column width="-1" hidden="0" name="csv_club" type="field"/>
+          <column width="-1" hidden="0" name="csv_first_runner" type="field"/>
+          <column width="-1" hidden="0" name="csv_last_runner" type="field"/>
+          <column width="-1" hidden="0" name="csv_firstname" type="field"/>
+          <column width="-1" hidden="0" name="csv_surname" type="field"/>
+          <column width="-1" hidden="0" name="csv_position" type="field"/>
+          <column width="-1" hidden="0" name="csv_days" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="csv_instructions" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16267,7 +16268,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" readOnly="0" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" geometry="No geometry" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry" maxScale="100000">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" geometry="No geometry" type="vector" minScale="1e+08" readOnly="0" maxScale="100000" refreshOnNotifyMessage="" wkbType="NoGeometry" styleCategories="AllStyleCategories">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16320,7 +16321,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16333,8 +16334,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
         <layer id="marshal_positions20160930121322287"/>
+        <layer id="all_routes20170907054841602"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -16348,13 +16349,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16363,7 +16364,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16371,7 +16372,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16439,7 +16440,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16447,7 +16448,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="243,166,178,255" type="QString"/>
@@ -16483,7 +16484,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16491,7 +16492,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -16554,7 +16555,7 @@ def my_form_open(dialog, layer, feature):
           <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16689,94 +16690,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="position"/>
-        <alias index="1" name="" field="club"/>
-        <alias index="2" name="" field="firstname"/>
-        <alias index="3" name="" field="surname"/>
-        <alias index="4" name="" field="name"/>
-        <alias index="5" name="" field="phone"/>
-        <alias index="6" name="" field="email"/>
-        <alias index="7" name="" field="captain"/>
-        <alias index="8" name="" field="captain_phone"/>
-        <alias index="9" name="" field="captain_email"/>
-        <alias index="10" name="" field="days"/>
-        <alias index="11" name="" field="races"/>
-        <alias index="12" name="" field="first_runner"/>
-        <alias index="13" name="" field="last_runner"/>
-        <alias index="14" name="" field="instructions"/>
+        <alias field="position" index="0" name=""/>
+        <alias field="club" index="1" name=""/>
+        <alias field="firstname" index="2" name=""/>
+        <alias field="surname" index="3" name=""/>
+        <alias field="name" index="4" name=""/>
+        <alias field="phone" index="5" name=""/>
+        <alias field="email" index="6" name=""/>
+        <alias field="captain" index="7" name=""/>
+        <alias field="captain_phone" index="8" name=""/>
+        <alias field="captain_email" index="9" name=""/>
+        <alias field="days" index="10" name=""/>
+        <alias field="races" index="11" name=""/>
+        <alias field="first_runner" index="12" name=""/>
+        <alias field="last_runner" index="13" name=""/>
+        <alias field="instructions" index="14" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="club" expression=""/>
-        <default applyOnUpdate="0" field="firstname" expression=""/>
-        <default applyOnUpdate="0" field="surname" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="phone" expression=""/>
-        <default applyOnUpdate="0" field="email" expression=""/>
-        <default applyOnUpdate="0" field="captain" expression=""/>
-        <default applyOnUpdate="0" field="captain_phone" expression=""/>
-        <default applyOnUpdate="0" field="captain_email" expression=""/>
-        <default applyOnUpdate="0" field="days" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
-        <default applyOnUpdate="0" field="first_runner" expression=""/>
-        <default applyOnUpdate="0" field="last_runner" expression=""/>
-        <default applyOnUpdate="0" field="instructions" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="club" applyOnUpdate="0" expression=""/>
+        <default field="firstname" applyOnUpdate="0" expression=""/>
+        <default field="surname" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="phone" applyOnUpdate="0" expression=""/>
+        <default field="email" applyOnUpdate="0" expression=""/>
+        <default field="captain" applyOnUpdate="0" expression=""/>
+        <default field="captain_phone" applyOnUpdate="0" expression=""/>
+        <default field="captain_email" applyOnUpdate="0" expression=""/>
+        <default field="days" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="first_runner" applyOnUpdate="0" expression=""/>
+        <default field="last_runner" applyOnUpdate="0" expression=""/>
+        <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="club" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="firstname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="surname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="phone" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="email" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="captain" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="captain_phone" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="captain_email" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="days" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="races" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="first_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="last_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="instructions" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="captain" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="captain_phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="captain_email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="captain_email" exp="" desc=""/>
-        <constraint field="days" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="firstname" desc="" exp=""/>
+        <constraint field="surname" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="phone" desc="" exp=""/>
+        <constraint field="email" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="captain_email" desc="" exp=""/>
+        <constraint field="days" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="position" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="221" type="field"/>
-          <column name="club" hidden="0" width="-1" type="field"/>
-          <column name="phone" hidden="0" width="-1" type="field"/>
-          <column name="email" hidden="0" width="-1" type="field"/>
-          <column name="captain" hidden="0" width="-1" type="field"/>
-          <column name="races" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="first_runner" hidden="0" width="-1" type="field"/>
-          <column name="last_runner" hidden="0" width="-1" type="field"/>
-          <column name="instructions" hidden="0" width="-1" type="field"/>
-          <column name="firstname" hidden="0" width="-1" type="field"/>
-          <column name="surname" hidden="0" width="-1" type="field"/>
-          <column name="captain_phone" hidden="0" width="-1" type="field"/>
-          <column name="captain_email" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="221" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="club" type="field"/>
+          <column width="-1" hidden="0" name="phone" type="field"/>
+          <column width="-1" hidden="0" name="email" type="field"/>
+          <column width="-1" hidden="0" name="captain" type="field"/>
+          <column width="-1" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="first_runner" type="field"/>
+          <column width="-1" hidden="0" name="last_runner" type="field"/>
+          <column width="-1" hidden="0" name="instructions" type="field"/>
+          <column width="-1" hidden="0" name="firstname" type="field"/>
+          <column width="-1" hidden="0" name="surname" type="field"/>
+          <column width="-1" hidden="0" name="captain_phone" type="field"/>
+          <column width="-1" hidden="0" name="captain_email" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16851,7 +16852,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16916,7 +16917,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16941,13 +16942,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16956,7 +16957,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16964,7 +16965,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17032,7 +17033,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17040,7 +17041,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="141,90,153,255" type="QString"/>
@@ -17076,7 +17077,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17084,7 +17085,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -17136,13 +17137,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" symbol="0" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17150,7 +17151,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17216,7 +17217,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17224,7 +17225,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -17289,7 +17290,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -17331,7 +17332,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17339,7 +17340,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -17373,7 +17374,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17381,7 +17382,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -17435,12 +17436,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -17448,7 +17449,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -17517,7 +17518,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17526,7 +17527,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17549,30 +17550,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17617,7 +17618,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17682,7 +17683,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17707,13 +17708,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17722,7 +17723,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17730,7 +17731,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17798,7 +17799,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17806,7 +17807,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="232,113,141,255" type="QString"/>
@@ -17842,7 +17843,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17850,7 +17851,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -17902,15 +17903,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.75" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="name" fontSize="8.5" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8.5" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.75" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1.5" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1.5" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17918,7 +17919,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -17953,7 +17954,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17984,9 +17985,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="1" xOffset="0" placementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="0.20000000000000001" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+          <placement priority="1" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.20000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -18027,7 +18028,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18055,12 +18056,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18068,7 +18069,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -18137,7 +18138,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18146,7 +18147,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18245,65 +18246,65 @@ 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 field="id" index="0" name=""/>
+        <alias field="osm_id" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="type" index="3" name=""/>
+        <alias field="z_order" index="4" name=""/>
+        <alias field="population" index="5" name=""/>
+        <alias field="label_x" index="6" name=""/>
+        <alias field="label_y" index="7" name=""/>
+        <alias field="label_rota" index="8" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="population" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="population" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="osm_id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="z_order" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="population" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_x" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_y" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_rota" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="population" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="population" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="osm_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="z_order" hidden="0" width="-1" type="field"/>
-          <column name="population" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rota" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="osm_id" type="field"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="0" name="population" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="label_x" type="field"/>
+          <column width="-1" hidden="0" name="label_y" type="field"/>
+          <column width="-1" hidden="0" name="label_rota" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18362,7 +18363,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18427,7 +18428,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18452,13 +18453,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18467,7 +18468,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18475,7 +18476,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -18543,7 +18544,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18551,7 +18552,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,158,23,255" type="QString"/>
@@ -18587,7 +18588,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18595,7 +18596,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -18647,15 +18648,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.80000000000000004" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+          <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="7" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18663,7 +18664,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -18713,7 +18714,7 @@ def my_form_open(dialog, layer, feature):
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18721,7 +18722,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -18756,7 +18757,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18766,9 +18767,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MapUnit" lineAnchorPercent="0.5" priority="3" xOffset="0" placementFlags="4" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="3" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="1" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="0.29999999999999999" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="5" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+          <placement priority="3" geometryGeneratorEnabled="0" placement="3" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="4" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.29999999999999999" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="5" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -18829,7 +18830,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18867,12 +18868,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18880,7 +18881,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -18949,7 +18950,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18958,7 +18959,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19088,100 +19089,100 @@ 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 field="osm_id" index="0" name=""/>
+        <alias field="name" index="1" name=""/>
+        <alias field="highway" index="2" name=""/>
+        <alias field="waterway" index="3" name=""/>
+        <alias field="aerialway" index="4" name=""/>
+        <alias field="barrier" index="5" name=""/>
+        <alias field="man_made" index="6" name=""/>
+        <alias field="z_order" index="7" name=""/>
+        <alias field="other_tags" index="8" name=""/>
+        <alias field="never_show" index="9" name=""/>
+        <alias field="label_x" index="10" name=""/>
+        <alias field="label_y" index="11" name=""/>
+        <alias field="label_rota" index="12" name=""/>
+        <alias field="always_sho" index="13" name=""/>
+        <alias field="resident_a" index="14" name=""/>
+        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="highway" expression=""/>
-        <default applyOnUpdate="0" field="waterway" expression=""/>
-        <default applyOnUpdate="0" field="aerialway" expression=""/>
-        <default applyOnUpdate="0" field="barrier" expression=""/>
-        <default applyOnUpdate="0" field="man_made" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="other_tags" expression=""/>
-        <default applyOnUpdate="0" field="never_show" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
-        <default applyOnUpdate="0" field="always_sho" expression=""/>
-        <default applyOnUpdate="0" field="resident_a" expression=""/>
-        <default applyOnUpdate="0" field="auxiliary_storage_labeling_show" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="highway" applyOnUpdate="0" expression=""/>
+        <default field="waterway" applyOnUpdate="0" expression=""/>
+        <default field="aerialway" applyOnUpdate="0" expression=""/>
+        <default field="barrier" applyOnUpdate="0" expression=""/>
+        <default field="man_made" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="other_tags" applyOnUpdate="0" expression=""/>
+        <default field="never_show" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="always_sho" applyOnUpdate="0" expression=""/>
+        <default field="resident_a" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="osm_id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="highway" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="waterway" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="aerialway" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="barrier" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="man_made" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="z_order" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="other_tags" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="never_show" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_x" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_y" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_rota" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="always_sho" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="resident_a" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="highway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="waterway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="aerialway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="barrier" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="man_made" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="other_tags" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="never_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="always_sho" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="resident_a" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="highway" desc="" exp=""/>
+        <constraint field="waterway" desc="" exp=""/>
+        <constraint field="aerialway" desc="" exp=""/>
+        <constraint field="barrier" desc="" exp=""/>
+        <constraint field="man_made" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="other_tags" desc="" exp=""/>
+        <constraint field="never_show" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
+        <constraint field="always_sho" desc="" exp=""/>
+        <constraint field="resident_a" desc="" exp=""/>
+        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="osm_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="160" type="field"/>
-          <column name="z_order" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="highway" hidden="0" width="-1" type="field"/>
-          <column name="waterway" hidden="0" width="-1" type="field"/>
-          <column name="aerialway" hidden="0" width="-1" type="field"/>
-          <column name="barrier" hidden="0" width="-1" type="field"/>
-          <column name="man_made" hidden="0" width="-1" type="field"/>
-          <column name="other_tags" hidden="0" width="142" type="field"/>
-          <column name="never_show" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rota" hidden="0" width="-1" type="field"/>
-          <column name="always_sho" hidden="0" width="-1" type="field"/>
-          <column name="resident_a" hidden="0" width="-1" type="field"/>
-          <column name="auxiliary_storage_labeling_show" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="osm_id" type="field"/>
+          <column width="160" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="highway" type="field"/>
+          <column width="-1" hidden="0" name="waterway" type="field"/>
+          <column width="-1" hidden="0" name="aerialway" type="field"/>
+          <column width="-1" hidden="0" name="barrier" type="field"/>
+          <column width="-1" hidden="0" name="man_made" type="field"/>
+          <column width="142" hidden="0" name="other_tags" type="field"/>
+          <column width="-1" hidden="0" name="never_show" type="field"/>
+          <column width="-1" hidden="0" name="label_x" type="field"/>
+          <column width="-1" hidden="0" name="label_y" type="field"/>
+          <column width="-1" hidden="0" name="label_rota" type="field"/>
+          <column width="-1" hidden="0" name="always_sho" type="field"/>
+          <column width="-1" hidden="0" name="resident_a" type="field"/>
+          <column width="-1" hidden="0" name="auxiliary_storage_labeling_show" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19350,7 +19351,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="0" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19415,7 +19416,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19440,13 +19441,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19455,7 +19456,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19463,7 +19464,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -19531,7 +19532,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19539,7 +19540,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="231,113,72,255" type="QString"/>
@@ -19575,7 +19576,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19583,7 +19584,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19635,17 +19636,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0"/>
-          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'" symbol="1"/>
-          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'" symbol="2"/>
-          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'" symbol="3"/>
-          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'" symbol="4"/>
-          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'" symbol="5"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19653,7 +19654,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19709,7 +19710,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19717,7 +19718,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,32,80,255" type="QString"/>
@@ -19771,7 +19772,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19779,7 +19780,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -19843,7 +19844,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19851,7 +19852,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -19905,7 +19906,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19913,7 +19914,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,12,254,255" type="QString"/>
@@ -20117,7 +20118,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="5" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20125,7 +20126,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="43,153,41,255" type="QString"/>
@@ -20183,12 +20184,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="name" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="2" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="2" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.69999999999999996" shapeSizeX="1" shapeRadiiX="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="2" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="2" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.69999999999999996" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="2" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20196,7 +20197,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -20231,7 +20232,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20257,9 +20258,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="2" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="3" yOffset="3" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="2" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1.8" zIndex="10" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+          <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="2" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="2" dist="3" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -20295,7 +20296,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -20323,12 +20324,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20336,7 +20337,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -20405,7 +20406,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20414,7 +20415,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20451,40 +20452,40 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="distance" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20533,7 +20534,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20606,13 +20607,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20621,7 +20622,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20629,7 +20630,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20697,7 +20698,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20705,7 +20706,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="152,125,183,255" type="QString"/>
@@ -20741,7 +20742,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20749,7 +20750,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -20801,9 +20802,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20811,7 +20812,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+            <layer class="LinePatternFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="135" type="QString"/>
                 <Option name="clip_mode" value="during_render" type="QString"/>
@@ -20851,7 +20852,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@0" frame_rate="10" type="line">
+              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20859,7 +20860,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+                <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="align_dash_pattern" value="0" type="QString"/>
                     <Option name="capstyle" value="square" type="QString"/>
@@ -20926,7 +20927,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="211,134,33,255" type="QString"/>
@@ -20978,12 +20979,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20991,7 +20992,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -21060,7 +21061,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="1" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21069,7 +21070,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21085,26 +21086,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias field="FID" index="0" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="FID" expression=""/>
+        <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="FID" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="FID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="431" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="431" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21149,7 +21150,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21214,7 +21215,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21239,13 +21240,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21254,7 +21255,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21262,7 +21263,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21330,7 +21331,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21338,7 +21339,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="190,207,80,255" type="QString"/>
@@ -21374,7 +21375,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21382,7 +21383,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -21434,16 +21435,16 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open"/>
-          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking"/>
-          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed"/>
-          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way"/>
-          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21451,7 +21452,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21528,7 +21529,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21536,7 +21537,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -21578,7 +21579,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21586,7 +21587,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -21638,7 +21639,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21646,7 +21647,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21722,7 +21723,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -21770,7 +21771,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21778,7 +21779,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -21836,7 +21837,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21844,7 +21845,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21920,7 +21921,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -21968,7 +21969,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21976,7 +21977,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -22034,7 +22035,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22042,7 +22043,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -22123,12 +22124,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="times" fontSize="9" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="times" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="9" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -22136,7 +22137,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -22171,7 +22172,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22181,9 +22182,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
+          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -22203,7 +22204,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -22231,12 +22232,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22244,7 +22245,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -22313,7 +22314,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -22322,7 +22323,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22359,40 +22360,40 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="status" expression=""/>
-        <default applyOnUpdate="0" field="times" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="status" applyOnUpdate="0" expression=""/>
+        <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="status" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="times" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="status" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="times" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="202" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="status" hidden="0" width="-1" type="field"/>
-          <column name="times" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="202" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="status" type="field"/>
+          <column width="-1" hidden="0" name="times" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22441,7 +22442,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -22506,7 +22507,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22531,13 +22532,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -22546,7 +22547,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22554,7 +22555,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -22622,7 +22623,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22630,7 +22631,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="225,89,137,255" type="QString"/>
@@ -22666,7 +22667,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22674,7 +22675,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -22726,17 +22727,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
-        <rules key="{d63c5432-5520-43ac-b983-fd469230b197}">
-          <rule key="{24a5df7c-cc81-475f-8d69-986aab397721}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes">
+        <rules key="{0a67d1c6-0289-43d0-8cea-e94d16054c5d}">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{c7589943-f7c2-4796-a405-6a8c9e18ff15}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22744,7 +22745,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -22794,7 +22795,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22802,7 +22803,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -22848,7 +22849,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -22858,9 +22859,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22911,7 +22912,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -22925,14 +22926,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{bf78850a-9784-4133-a14f-0af30e9c2f70}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" active="0">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" key="{1a82228c-f408-4c3d-bb8d-158713c47604}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22940,7 +22941,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -22990,7 +22991,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22998,7 +22999,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -23044,7 +23045,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23054,9 +23055,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23107,7 +23108,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23121,15 +23122,15 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{e726e3ba-accf-434a-8ffa-dceae4642f95}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0">
-            <rule key="{a640a5b0-35c2-4ff6-9023-5e825ddbe7be}" filter="&quot;Source&quot; = '21KM'" description="21KM" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="List for legends" key="{7d9fbabe-f214-4fb9-95d9-394d2a4b278b}">
+            <rule filter="&quot;Source&quot; = '21KM'" active="0" description="21KM" key="{69589abf-aba7-483e-bc24-1c579c8a7db2}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23137,7 +23138,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="210,32,39,255" type="QString"/>
@@ -23172,7 +23173,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23203,9 +23204,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23246,7 +23247,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23260,14 +23261,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule key="{aa14f8a1-c725-4fd0-ab45-a85ddb7a4401}" filter="&quot;Source&quot; = '10KM'" description="10KM" active="0">
+            <rule filter="&quot;Source&quot; = '10KM'" active="0" description="10KM" key="{34957aa9-d2ac-43d2-9f4f-403b25511a32}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23275,7 +23276,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="103,34,144,255" type="QString"/>
@@ -23310,7 +23311,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23341,9 +23342,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23384,7 +23385,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23398,14 +23399,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule key="{9fb8f756-122b-4772-a202-d4f6e472edf2}" filter="&quot;Source&quot; = '5KM'" description="5KM" active="0">
+            <rule filter="&quot;Source&quot; = '5KM'" active="0" description="5KM" key="{693188a6-ae99-4fd2-859f-1606793dda66}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23413,7 +23414,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="145,211,55,255" type="QString"/>
@@ -23448,7 +23449,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23479,9 +23480,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23522,7 +23523,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23536,14 +23537,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule key="{5aa6b2d0-7089-489a-9176-ba78eb19ffde}" filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0">
+            <rule filter="&quot;Source&quot; = 'Trail'" active="0" description="Trail" key="{ba58e108-c24a-410e-9584-a7819af049ef}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23551,7 +23552,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="angle" value="0" type="QString"/>
                           <Option name="cap_style" value="square" type="QString"/>
@@ -23601,7 +23602,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23609,7 +23610,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="0,72,255,255" type="QString"/>
@@ -23644,7 +23645,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23654,9 +23655,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23697,7 +23698,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23723,19 +23724,19 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE(&quot;Text&quot;, '&lt;NULL>')" type="QString"/>
           </Option>
           <Option name="embeddedWidgets/count" value="0" type="QString"/>
-          <Option name="variableNames" type="invalid"/>
-          <Option name="variableValues" type="invalid"/>
+          <Option name="variableNames"/>
+          <Option name="variableValues"/>
         </Option>
       </customproperties>
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23743,7 +23744,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -23812,7 +23813,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -23821,7 +23822,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23971,95 +23972,95 @@ 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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
-        <alias index="12" name="" field="org_fid"/>
-        <alias index="13" name="" field="distance"/>
-        <alias index="14" name="" field="quadrant"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="Sort" index="8" name=""/>
+        <alias field="day" index="9" name=""/>
+        <alias field="length_km" index="10" name=""/>
+        <alias field="length_m" index="11" name=""/>
+        <alias field="org_fid" index="12" name=""/>
+        <alias field="distance" index="13" name=""/>
+        <alias field="quadrant" index="14" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="quadrant" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="quadrant" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="descriptio" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="timestamp" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="begin" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="end" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Source" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Sort" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_km" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_m" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="org_fid" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="quadrant" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="quadrant" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="quadrant" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="org_fid" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="Name" hidden="0" width="-1" type="field"/>
-          <column name="Source" hidden="0" width="-1" type="field"/>
-          <column name="RouteLen" hidden="0" width="-1" type="field"/>
-          <column name="descriptio" hidden="0" width="-1" type="field"/>
-          <column name="timestamp" hidden="0" width="-1" type="field"/>
-          <column name="begin" hidden="0" width="-1" type="field"/>
-          <column name="end" hidden="0" width="-1" type="field"/>
-          <column name="Distance" hidden="0" width="-1" type="field"/>
-          <column name="length_km" hidden="0" width="-1" type="field"/>
-          <column name="Sort" hidden="0" width="-1" type="field"/>
-          <column name="quadrant" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="length_m" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="org_fid" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="-1" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" name="Sort" type="field"/>
+          <column width="-1" hidden="0" name="quadrant" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24146,7 +24147,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24219,13 +24220,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -24234,7 +24235,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24242,7 +24243,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24310,7 +24311,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24318,7 +24319,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="229,182,54,255" type="QString"/>
@@ -24354,7 +24355,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24362,7 +24363,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -24414,9 +24415,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24424,7 +24425,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="114,155,111,255" type="QString"/>
@@ -24473,7 +24474,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -24505,35 +24506,35 @@ 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 field="id" index="0" name=""/>
+        <alias field="area" index="1" name=""/>
+        <alias field="rotation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="area" expression=""/>
-        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="area" applyOnUpdate="0" expression=""/>
+        <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="area" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="rotation" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="area" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="rotation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="area" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="area" type="field"/>
+          <column width="-1" hidden="0" name="rotation" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24556,7 +24557,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="0" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24621,7 +24622,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24646,13 +24647,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -24661,7 +24662,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24669,7 +24670,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24737,7 +24738,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24745,7 +24746,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="196,60,57,255" type="QString"/>
@@ -24781,7 +24782,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24789,7 +24790,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -24841,12 +24842,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
+          <rule checkstate="0" symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24854,7 +24855,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="1" pass="0">
+            <layer class="SimpleMarker" locked="1" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -24938,12 +24939,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24951,7 +24952,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -25020,7 +25021,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -25029,7 +25030,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25138,85 +25139,85 @@ 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 field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="RouteLen" index="5" name=""/>
+        <alias field="Source" index="6" name=""/>
+        <alias field="length_m" index="7" name=""/>
+        <alias field="length_km" index="8" name=""/>
+        <alias field="org_fid" index="9" name=""/>
+        <alias field="distance" index="10" name=""/>
+        <alias field="first_runn" index="11" name=""/>
+        <alias field="last_runne" index="12" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="first_runn" expression=""/>
-        <default applyOnUpdate="0" field="last_runne" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="first_runn" applyOnUpdate="0" expression=""/>
+        <default field="last_runne" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="descriptio" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="timestamp" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="begin" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="end" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Source" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_m" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_km" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="org_fid" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="first_runn" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="last_runne" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="first_runn" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="last_runne" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="first_runn" desc="" exp=""/>
+        <constraint field="last_runne" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="begin" hidden="0" width="179" type="field"/>
-          <column name="RouteLen" hidden="0" width="-1" type="field"/>
-          <column name="Source" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="Name" hidden="0" width="-1" type="field"/>
-          <column name="length_m" hidden="0" width="-1" type="field"/>
-          <column name="length_km" hidden="0" width="-1" type="field"/>
-          <column name="org_fid" hidden="0" width="-1" type="field"/>
-          <column name="first_runn" hidden="0" width="-1" type="field"/>
-          <column name="last_runne" hidden="0" width="-1" type="field"/>
-          <column name="descriptio" hidden="0" width="-1" type="field"/>
-          <column name="timestamp" hidden="0" width="-1" type="field"/>
-          <column name="end" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
+          <column width="179" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" name="org_fid" type="field"/>
+          <column width="-1" hidden="0" name="first_runn" type="field"/>
+          <column width="-1" hidden="0" name="last_runne" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25307,7 +25308,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25380,13 +25381,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -25395,7 +25396,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25403,7 +25404,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -25471,7 +25472,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25479,7 +25480,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="190,178,151,255" type="QString"/>
@@ -25515,7 +25516,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25523,7 +25524,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -25575,13 +25576,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" symbol="0" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25589,7 +25590,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -25655,7 +25656,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25663,7 +25664,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -25728,7 +25729,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -25770,7 +25771,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -25778,7 +25779,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -25812,7 +25813,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -25820,7 +25821,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -25874,12 +25875,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25887,7 +25888,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -25956,7 +25957,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -25965,7 +25966,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25988,30 +25989,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26056,7 +26057,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="0" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26129,13 +26130,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -26144,7 +26145,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26152,7 +26153,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -26220,7 +26221,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26228,7 +26229,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="145,82,45,255" type="QString"/>
@@ -26264,7 +26265,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26272,7 +26273,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -26324,15 +26325,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="label" fontSize="15" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="15" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -26340,7 +26341,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -26375,7 +26376,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26385,9 +26386,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+          <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26407,7 +26408,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -26434,12 +26435,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26447,7 +26448,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -26516,7 +26517,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -26525,7 +26526,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26548,30 +26549,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="label"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="label" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26616,7 +26617,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -26681,7 +26682,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -26706,13 +26707,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -26721,7 +26722,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26729,7 +26730,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -26797,7 +26798,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26805,7 +26806,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -26841,7 +26842,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26849,7 +26850,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -26901,17 +26902,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="75" fontUnderline="0" fontStrikeout="0" namedStyle="Bold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="label" fontSize="8" forcedBold="0" textColor="31,120,180,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="75" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="31,120,180,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="0.75" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0.5" shapeRotation="0" shapeBorderWidth="0.75" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.75" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeOffsetY="-0.14999999999999999" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="0.75" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="-0.14999999999999999" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRotation="0" shapeBorderColor="31,120,206,255" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -26919,7 +26920,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -26969,7 +26970,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -26977,7 +26978,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,204" type="QString"/>
@@ -27012,7 +27013,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -27022,9 +27023,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="1" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="1" lineAnchorType="0" centroidWhole="1" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PolygonGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="6" obstacle="1" obstacleFactor="0.76000000000000001" zIndex="5" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="1" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="1" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PolygonGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="1" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="6" unplacedVisibility="0" obstacleFactor="0.76000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27044,7 +27045,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -27080,12 +27081,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27093,7 +27094,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -27162,7 +27163,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -27171,7 +27172,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -27230,45 +27231,45 @@ 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 field="id" index="0" name=""/>
+        <alias field="table_set" index="1" name=""/>
+        <alias field="label" index="2" name=""/>
+        <alias field="races" index="3" name=""/>
+        <alias field="day" index="4" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="table_set" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="table_set" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="table_set" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="races" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="table_set" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="table_set" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="table_set" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="races" hidden="0" width="130" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="table_set" type="field"/>
+          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="130" hidden="0" name="races" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27688,292 +27689,295 @@ def my_form_open(dialog, layer, feature):
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="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="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer 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"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="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 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="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="water_tables20170921142016467" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Fencing">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer 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="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <checked-group-nodes>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - inset">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1" style="default"/>
       <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="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="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"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - main">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
       <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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="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"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal plan">
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
+        <checked-legend-node id="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+      </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Feeding Stations"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <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 name="Routes" has-checked-group-info="1" has-expanded-info="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 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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="water_tables20170921142016467" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer 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"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="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="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="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <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="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -28001,11 +28005,11 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" worldFileMap="" units="mm" name="Marshals">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshals" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28013,7 +28017,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28047,9 +28051,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28062,7 +28066,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28070,7 +28074,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28107,9 +28111,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="5" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="19.9422,32,mm" titleAlignment="1" position="128.508,3.98741,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="128.508,3.98741,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="bevel" wmsLegendHeight="25" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.1,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="128" green="128" red="128"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="128.508,3.98741,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="5" background="true" symbolWidth="7" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" opacity="1" position="128.508,3.98741,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.1,mm" size="19.9422,32,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="bevel" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="128" blue="128" alpha="255" red="128"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28123,31 +28127,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="1" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -28161,9 +28165,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="56.5192,54.5647,mm" groupUuid="" frame="true" followPresetName="Marshal map - inset" excludeFromExports="0" position="98.7828,149.027,mm" followPreset="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.2,mm" positionLock="true" blendMode="0" zValue="4" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" mapFlags="0" positionOnPage="98.7828,149.027,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Inset map" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" position="98.7828,149.027,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="56.5192,54.5647,mm" mapFlags="0" positionLock="true" positionOnPage="98.7828,149.027,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" frame="true" itemRotation="0" zValue="4" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28176,11 +28180,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94603505205213878" ymax="-33.94188878914365404" xmax="18.42218047871277165" xmin="18.41788569471234993"/>
+        <Extent xmin="18.41788569471234993" xmax="18.42218047871277165" ymax="-33.94188878914365404" ymin="-33.94603505205213878"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28188,7 +28192,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28256,7 +28260,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28264,7 +28268,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28315,12 +28319,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28328,7 +28332,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28363,7 +28367,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28385,8 +28389,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" inverted="0" show="1" name="Overview 1" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3">
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" centered="1">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28394,7 +28398,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,65,170,127" type="QString"/>
@@ -28443,14 +28447,14 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="142,187.018,mm" groupUuid="" frame="false" followPresetName="Marshal map - main" excludeFromExports="0" position="3.53,6.0007,mm" followPreset="true" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" isTemporal="0" background="false" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" mapFlags="0" positionOnPage="3.53,6.0007,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Main map" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3.53,6.0007,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="142,187.018,mm" mapFlags="0" positionLock="true" positionOnPage="3.53,6.0007,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28463,11 +28467,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94463864108302431" ymax="-33.94328520011277561" xmax="18.42054691083765405" xmin="18.41951926258746752"/>
+        <Extent xmin="18.41951926258746752" xmax="18.42054691083765405" ymax="-33.94328520011277561" ymin="-33.94463864108302431"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28475,7 +28479,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28543,7 +28547,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28551,7 +28555,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28602,12 +28606,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28615,7 +28619,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28650,7 +28654,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28674,14 +28678,14 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem hideBackgroundIfEmpty="0" referencePoint="2" type="65647" opacity="1" size="142.117,187.018,mm" groupUuid="" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" frame="false" excludeFromExports="0" position="290.617,6.0007,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" background="false" hidePageIfEmpty="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" sectionY="0" blendMode="0" zValue="2" sectionHeight="187.018" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" id="" sectionX="0" positionOnPage="290.617,6.0007,mm" frameJoinStyle="round" sectionWidth="142.117" visibility="1">
-        <FrameColor alpha="255" blue="119" green="119" red="119"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" referencePoint="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" position="290.617,6.0007,mm" sectionWidth="142.117" blendMode="0" opacity="1" hidePageIfEmpty="0" size="142.117,187.018,mm" positionLock="true" positionOnPage="290.617,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="187.018" groupUuid="" hideBackgroundIfEmpty="0" excludeFromExports="0" background="false" frameJoinStyle="round" visibility="1" sectionX="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" sectionY="0" zValue="2" type="65647">
+        <FrameColor green="119" blue="119" alpha="255" red="119"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28695,9 +28699,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="0" pictureHeight="25.2491" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="47.1065" svgFillColor="255,255,255,255" size="47.1065,27.6,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="246.665,178.41,mm" mapUuid="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" file="../GunRun2022_500.png" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" id="" positionOnPage="246.665,178.41,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="25.2491" size="47.1065,27.6,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="246.665,178.41,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_500.png" pictureWidth="47.1065" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28717,7 +28721,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" maxBreakDistance="12" url="" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" stylesheetEnabled="true" evaluateExpressions="true" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" resizeMode="0" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
+      <LayoutMultiFrame contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" maxBreakDistance="12" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" url="">
         <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -28754,13 +28758,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="&quot;id&quot;" coverageLayerName="marshal_positions" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" sortAscending="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" pageNameExpression="&quot;position&quot;" sortKey="&quot;id&quot;" enabled="1" hideCoverage="0" coverageLayerName="marshal_positions"/>
     </Layout>
-    <Layout printResolution="300" worldFileMap="" units="mm" name="Start &amp; Finish Backgrounds">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28768,7 +28772,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28802,9 +28806,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28817,7 +28821,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28825,7 +28829,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28862,9 +28866,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="0" pictureHeight="7.97477" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" size="9.45865,11,mm" groupUuid="" pictureRotation="330" frame="false" northMode="0" excludeFromExports="0" position="286.027,2,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" mode="0" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="arrows/NorthArrow_11.svg" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" id="" positionOnPage="286.027,2,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="7.97477" size="9.45865,11,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="286.027,2,mm" svgBorderColor="0,0,0,255" northMode="0" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="330" visibility="1" mode="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28884,9 +28888,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="142.543,10.3185,mm" groupUuid="" frame="false" excludeFromExports="0" position="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" marginY="1" itemRotation="270" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="3" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" id="" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" position="285.027,205.886,mm" blendMode="0" opacity="1" size="142.543,10.3185,mm" positionLock="true" positionOnPage="285.027,205.886,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="270" valign="64" zValue="3" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28899,12 +28903,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28912,7 +28916,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28947,7 +28951,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28957,9 +28961,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem segmentMillimeters="26.3519" numSubdivisions="1" background="false" groupUuid="" positionLock="true" lineCapStyle="square" segmentSizeMode="1" blendMode="0" labelVerticalPlacement="0" numSegmentsLeft="2" type="65646" labelBarSpace="3" height="3" lineJoinStyle="miter" outlineWidth="0.3" numUnitsPerSegment="100" visibility="1" style="Single Box" id="" itemRotation="0" boxContentSpace="1" zValue="2" excludeFromExports="0" referencePoint="0" size="145.54,16.2165,mm" alignment="0" position="7,189.669,mm" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" unitType="meters" maxBarWidth="150" positionOnPage="7,189.669,mm" labelHorizontalPlacement="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" frameJoinStyle="miter" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" subdivisionsHeight="1.5" numMapUnitsPerScaleBarUnit="1" numSegments="4" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineJoinStyle="miter" style="Single Box" outlineWidth="0.3" segmentMillimeters="26.3519" alignment="0" referencePoint="0" positionOnPage="7,189.669,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="50" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="1" labelBarSpace="3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" opacity="1" position="7,189.669,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="150" outlineWidthM="0.3,mm" numSegments="4" unitLabel="m" size="145.54,16.2165,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="3" numUnitsPerSegment="100">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28972,12 +28976,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28985,7 +28989,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29020,7 +29024,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29029,7 +29033,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" value="" type="QChar"/>
@@ -29041,10 +29045,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29052,7 +29056,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -29120,7 +29124,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29128,7 +29132,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -29196,7 +29200,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29204,7 +29208,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -29272,7 +29276,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29280,7 +29284,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -29316,7 +29320,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29324,7 +29328,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29360,9 +29364,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="330" size="278.027,180.318,mm" groupUuid="" frame="false" followPresetName="Start/Finish" excludeFromExports="0" position="7,5.5,mm" followPreset="true" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" isTemporal="0" background="false" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" mapFlags="0" positionOnPage="7,5.5,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" position="7,5.5,mm" mapRotation="330" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="278.027,180.318,mm" mapFlags="0" positionLock="true" positionOnPage="7,5.5,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Start/Finish" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29391,11 +29395,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
+        <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="3" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="4" unit="1" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="3" annotationExpression="" gridFrameMargin="0" intervalY="5" intervalX="5" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29403,7 +29407,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -29471,7 +29475,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29479,7 +29483,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -29541,12 +29545,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -29554,7 +29558,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29589,7 +29593,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29613,10 +29617,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -29643,13 +29647,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;area&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" coverageLayerName="start_finish_area" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;area&quot;" sortKey="area" enabled="1" hideCoverage="1" coverageLayerName="start_finish_area"/>
     </Layout>
-    <Layout printResolution="300" worldFileMap="" units="mm" name="Fencing">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Fencing" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29657,7 +29661,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29691,9 +29695,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -29706,7 +29710,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29714,7 +29718,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29751,9 +29755,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="0" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="11" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="38.1563,67.2879,mm" titleAlignment="1" position="256.808,5.21277,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="256.808,5.21277,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="256.808,5.21277,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="11" background="true" symbolWidth="7" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" opacity="1" position="256.808,5.21277,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="38.1563,67.2879,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29767,31 +29771,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Bold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Fencing and Cones" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" name="fencing" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
@@ -29803,11 +29807,11 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -29821,9 +29825,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="148.46,6.45211,mm" groupUuid="" frame="false" excludeFromExports="0" position="6.76779,191.188,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="10" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" id="" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" marginX="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" position="6.76779,191.188,mm" blendMode="0" opacity="1" size="148.46,6.45211,mm" positionLock="true" positionOnPage="6.76779,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="10" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29836,12 +29840,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29849,7 +29853,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29884,7 +29888,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29894,9 +29898,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="1" size="56.3557,6.45237,mm" groupUuid="" frame="false" excludeFromExports="0" position="182.723,191.188,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="9" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" id="" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" referencePoint="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginX="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" position="182.723,191.188,mm" blendMode="0" opacity="1" size="56.3557,6.45237,mm" positionLock="true" positionOnPage="182.723,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="9" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29909,12 +29913,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29922,7 +29926,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29957,7 +29961,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29967,9 +29971,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="26.8205,6.82826,mm" groupUuid="" frame="false" excludeFromExports="0" position="209.146,198.083,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" id="" labelText="REVISION 2.0" positionOnPage="209.146,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" referencePoint="0" labelText="REVISION 2.0" marginX="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" position="209.146,198.083,mm" blendMode="0" opacity="1" size="26.8205,6.82826,mm" positionLock="true" positionOnPage="209.146,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29982,12 +29986,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29995,7 +29999,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30030,7 +30034,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30040,9 +30044,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="51.1638,7.07327,mm" groupUuid="" frame="false" excludeFromExports="0" position="62.6706,198.083,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="7" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" id="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" position="62.6706,198.083,mm" blendMode="0" opacity="1" size="51.1638,7.07327,mm" positionLock="true" positionOnPage="62.6706,198.083,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30055,12 +30059,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30068,7 +30072,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30103,7 +30107,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30113,9 +30117,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="64.7594,7.10512,mm" groupUuid="" frame="false" excludeFromExports="0" position="116.805,198.083,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="6" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" id="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginX="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" position="116.805,198.083,mm" blendMode="0" opacity="1" size="64.7594,7.10512,mm" positionLock="true" positionOnPage="116.805,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30128,12 +30132,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30141,7 +30145,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30176,7 +30180,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30186,9 +30190,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="52.7903,7.07327,mm" groupUuid="" frame="false" excludeFromExports="0" position="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="5" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" id="" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" marginX="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" position="6.76779,198.083,mm" blendMode="0" opacity="1" size="52.7903,7.07327,mm" positionLock="true" positionOnPage="6.76779,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30201,12 +30205,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30214,7 +30218,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30249,7 +30253,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30259,9 +30263,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="8" pictureHeight="26.4325" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" size="49.3143,29.8354,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="243.098,175.353,mm" mapUuid="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="../GunRun2022_250.png" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" id="" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,29.8354,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.098,175.353,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30281,9 +30285,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="232.01,0.14328,mm" groupUuid="" frame="false" excludeFromExports="0" position="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" id="" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" blendMode="0" opacity="1" size="232.01,0.14328,mm" positionLock="true" positionOnPage="6.91779,197.79,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30296,7 +30300,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30304,7 +30308,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -30339,9 +30343,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem segmentMillimeters="32.0947" numSubdivisions="1" background="false" groupUuid="" positionLock="true" lineCapStyle="square" segmentSizeMode="1" blendMode="0" labelVerticalPlacement="0" numSegmentsLeft="2" type="65646" labelBarSpace="1" height="2" lineJoinStyle="round" outlineWidth="0.2" numUnitsPerSegment="20" visibility="1" style="Double Box" id="" itemRotation="0" boxContentSpace="0.2" zValue="2" excludeFromExports="0" referencePoint="0" size="106.045,15.8378,mm" alignment="0" position="6.76779,2.8482,mm" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" unitType="meters" maxBarWidth="100" positionOnPage="6.76779,2.8482,mm" labelHorizontalPlacement="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" frameJoinStyle="miter" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" subdivisionsHeight="1.5" numMapUnitsPerScaleBarUnit="1" numSegments="2" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineJoinStyle="round" style="Double Box" outlineWidth="0.2" segmentMillimeters="32.0947" alignment="0" referencePoint="0" positionOnPage="6.76779,2.8482,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="25" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="0.2" labelBarSpace="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" opacity="1" position="6.76779,2.8482,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="100" outlineWidthM="0.3,mm" numSegments="2" unitLabel="m" size="106.045,15.8378,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="2" numUnitsPerSegment="20">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30354,12 +30358,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30367,7 +30371,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30402,7 +30406,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30411,7 +30415,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" value="" type="QChar"/>
@@ -30423,10 +30427,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30434,7 +30438,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -30502,7 +30506,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30510,7 +30514,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -30578,7 +30582,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30586,7 +30590,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -30654,7 +30658,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30662,7 +30666,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -30698,7 +30702,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30706,7 +30710,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30742,9 +30746,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="0.9" mapRotation="0" size="283.418,180.92,mm" groupUuid="" frame="false" followPresetName="Fencing" excludeFromExports="0" position="6.76779,9.35102,mm" followPreset="true" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" isTemporal="0" background="false" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" mapFlags="0" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="6.76779,9.35102,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="0.9" size="283.418,180.92,mm" mapFlags="0" positionLock="true" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Fencing" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30779,7 +30783,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90819730717838354" ymax="-33.90718453497852636" xmax="18.40524827801807461" xmin="18.40366172969380543"/>
+        <Extent xmin="18.40366172969380543" xmax="18.40524827801807461" ymax="-33.90718453497852636" ymin="-33.90819730717838354"/>
         <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>
@@ -30794,9 +30798,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="3" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="4" unit="1" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="3" annotationExpression="" gridFrameMargin="0" intervalY="5" intervalX="5" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30804,7 +30808,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -30872,7 +30876,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30880,7 +30884,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -30942,12 +30946,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -30955,7 +30959,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30990,7 +30994,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31014,10 +31018,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -31044,13 +31048,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;name&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortKey="&quot;group&quot;" coverageLayerName="fence_groups" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" enabled="1" hideCoverage="1" coverageLayerName="fence_groups"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" name="Ask Me">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="9" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="9" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31058,7 +31062,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31092,9 +31096,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31107,7 +31111,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31115,7 +31119,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31151,12 +31155,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="83.9998,10.4638,mm" groupUuid="" frame="false" excludeFromExports="0" position="4.43449,186.634,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="8" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" id="" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" referencePoint="0" labelText="Directions to Start of Race" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" position="4.43449,186.634,mm" blendMode="0" opacity="1" size="83.9998,10.4638,mm" positionLock="false" positionOnPage="4.43449,186.634,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31169,12 +31173,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="14" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31182,7 +31186,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31217,7 +31221,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31227,9 +31231,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="48.2923,9.511,mm" groupUuid="" frame="false" excludeFromExports="0" position="4.43449,197.498,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="7" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" id="" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" referencePoint="0" labelText="Gun Run" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" position="4.43449,197.498,mm" blendMode="0" opacity="1" size="48.2923,9.511,mm" positionLock="false" positionOnPage="4.43449,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31242,12 +31246,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31255,7 +31259,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31290,7 +31294,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31300,9 +31304,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true" groupUuid="" positionLock="false" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="9" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="6" symbolHeight="5" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="59.0766,76,mm" titleAlignment="1" position="10.096,10.8563,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" equalColumnWidth="0" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" legendFilterByMap="1" columnSpace="0" positionOnPage="10.096,10.8563,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="round" wmsLegendHeight="25" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" opacity="1" boxSpace="2" lineSpacing="2" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="139" green="139" red="139"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="0" rasterBorder="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" title="" lineSpacing="2" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="10.096,10.8563,mm" type="65642" legendFilterByAtlas="0" symbolHeight="5" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="true" equalColumnWidth="0" itemRotation="0" zValue="6" background="true" symbolWidth="9" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" opacity="1" position="10.096,10.8563,mm" positionLock="false" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" legendFilterByMap="1" size="59.0766,76,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="round" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="139" blue="139" alpha="255" red="139"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31316,33 +31320,33 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2.5" marginLeft="3" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" marginLeft="3" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Ask Me" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me" groupLayer="">
             <customproperties>
               <Option type="Map">
                 <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" expanded="1" name="poi_labels" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="Start/Finish" type="QString"/>
@@ -31355,7 +31359,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" expanded="1" name="directions_to_start" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
@@ -31369,9 +31373,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="27.7839,6.871,mm" groupUuid="" frame="false" excludeFromExports="0" position="221.862,190.027,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="5" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" id="" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" position="221.862,190.027,mm" blendMode="0" opacity="1" size="27.7839,6.871,mm" positionLock="false" positionOnPage="221.862,190.027,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31384,12 +31388,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31397,7 +31401,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31432,7 +31436,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31442,9 +31446,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="51.6706,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="197.975,197.498,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="4" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" position="197.975,197.498,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="false" positionOnPage="197.975,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31457,12 +31461,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31470,7 +31474,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31505,7 +31509,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31515,9 +31519,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="24.3824" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" size="42.9838,24.3824,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="249.646,179.724,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="3" file="../Gun_Run_Logo.png" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" id="" positionOnPage="249.646,179.724,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="24.3824" size="42.9838,24.3824,mm" positionLock="false" svgBorderWidth="0.2" northOffset="0" positionOnPage="249.646,179.724,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="24.2337" groupUuid="" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31537,9 +31541,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="244.912,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="4.58449,197.248,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="2" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" id="" positionOnPage="4.58449,197.248,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" blendMode="0" opacity="1" size="244.912,0.1,mm" positionLock="false" positionOnPage="4.58449,197.248,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31552,7 +31556,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31560,7 +31564,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -31595,9 +31599,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="288.007,183.616,mm" groupUuid="" frame="false" followPresetName="Ask Me" excludeFromExports="0" position="4.43449,6.411,mm" followPreset="true" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" mapFlags="0" positionOnPage="4.43449,6.411,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="4.43449,6.411,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="288.007,183.616,mm" mapFlags="0" positionLock="false" positionOnPage="4.43449,6.411,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Ask Me" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31626,7 +31630,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
+        <Extent xmin="18.39762336729721071" xmax="18.41789384089274151" 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>
@@ -31641,9 +31645,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31651,7 +31655,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -31719,7 +31723,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31727,7 +31731,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -31778,12 +31782,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -31791,7 +31795,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31826,7 +31830,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31850,10 +31854,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -31871,13 +31875,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" sortFeatures="0" hideCoverage="0" filterFeatures="0"/>
+      <Atlas coverageLayer="" sortFeatures="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0" hideCoverage="0"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="" units="mm" name="Routes">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="144" name="Routes" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31885,7 +31889,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31919,9 +31923,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31934,7 +31938,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31942,7 +31946,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31978,12 +31982,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="61.5373,6.8714,mm" groupUuid="" frame="false" excludeFromExports="0" position="200.171,199.082,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="13" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" id="" labelText="REVISION 3.2" positionOnPage="200.171,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" referencePoint="0" labelText="REVISION 3.2" marginX="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" position="200.171,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.8714,mm" positionLock="true" positionOnPage="200.171,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="13" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31996,12 +32000,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32009,7 +32013,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32044,7 +32048,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32054,9 +32058,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="61.5373,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.7863,192.073,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="12" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" id="" labelText="Gun Run 2022: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" marginX="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" position="9.7863,192.073,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,192.073,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="12" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32069,12 +32073,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32082,7 +32086,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32117,7 +32121,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32127,9 +32131,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="61.5373,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.7863,199.082,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="11" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" id="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" positionOnPage="9.7863,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" marginX="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" position="9.7863,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="11" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32142,12 +32146,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32155,7 +32159,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32190,7 +32194,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32200,9 +32204,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="15.9472" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" size="29.7523,17.4718,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="262.196,188.218,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="10" file="../GunRun2022_250.png" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" id="" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="15.9472" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="29.7523" groupUuid="" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="10" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32222,9 +32226,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="251.982,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.57644,198.832,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="9" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" id="" positionOnPage="9.57644,198.832,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.57644,198.832,mm" blendMode="0" opacity="1" size="251.982,0.1,mm" positionLock="true" positionOnPage="9.57644,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="9" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32237,7 +32241,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32245,7 +32249,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -32280,9 +32284,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="107.861,186.385,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="9.57644,5.42566,mm" followPreset="true" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="8" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" mapFlags="0" positionOnPage="9.57644,5.42566,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Trail Finish" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" position="9.57644,5.42566,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="107.861,186.385,mm" mapFlags="0" positionLock="true" positionOnPage="9.57644,5.42566,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="8" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32301,18 +32305,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.93243205975926458" ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
+        <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905" ymin="-33.93243205975926458"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="179.156,189.279,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="112.643,4.09761,mm" followPreset="true" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="7" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" mapFlags="0" positionOnPage="112.643,4.09761,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Trail Start" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" position="112.643,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="179.156,189.279,mm" mapFlags="0" positionLock="true" positionOnPage="112.643,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="7" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32331,18 +32335,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95772328900195447" ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
+        <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743" ymin="-33.95772328900195447"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="67.7828,166.874,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="5.86559,4.09761,mm" followPreset="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="6" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" mapFlags="0" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Left inset 21KM" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="6" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32386,18 +32390,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
+        <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="113.3,76.1023,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="133.191,119.125,mm" followPreset="true" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="5" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" mapFlags="0" positionOnPage="133.191,119.125,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="144" green="34" red="103"/>
-        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
+      <LayoutItem id="Bottom inset 21KM" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="133.191,119.125,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="113.3,76.1023,mm" mapFlags="0" positionLock="true" positionOnPage="133.191,119.125,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="5" type="65639">
+        <FrameColor green="34" blue="144" alpha="255" red="103"/>
+        <BackgroundColor green="175" blue="215" alpha="255" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32416,18 +32420,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
+        <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="68.3676,117.12,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="19.6693,7.89412,mm" followPreset="true" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" id="End inset Trail" mapFlags="0" positionOnPage="19.6693,7.89412,mm" frameJoinStyle="miter" visibility="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="End inset Trail" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" referencePoint="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" position="19.6693,7.89412,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="68.3676,117.12,mm" mapFlags="0" positionLock="true" positionOnPage="19.6693,7.89412,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="4" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32446,18 +32450,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91454383501641701" ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744"/>
+        <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005" ymin="-33.91454383501641701"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="63.655,88.3012,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="170.062,49.6297,mm" followPreset="true" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" id="Start inset Trail" mapFlags="0" positionOnPage="170.062,49.6297,mm" frameJoinStyle="miter" visibility="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Start inset Trail" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" referencePoint="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" position="170.062,49.6297,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="63.655,88.3012,mm" mapFlags="0" positionLock="true" positionOnPage="170.062,49.6297,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="3" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32476,18 +32480,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94823764719958348" ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893"/>
+        <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591" ymin="-33.94823764719958348"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="75.8756,69.7635,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="200.321,125.314,mm" followPreset="true" uuid="{917a530c-14f4-4ed8-b109-961939435221}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" id="Contour inset Trail" mapFlags="0" positionOnPage="200.321,125.314,mm" frameJoinStyle="miter" visibility="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Contour inset Trail" uuid="{917a530c-14f4-4ed8-b109-961939435221}" referencePoint="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" position="200.321,125.314,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="75.8756,69.7635,mm" mapFlags="0" positionLock="true" positionOnPage="200.321,125.314,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32506,18 +32510,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95702588572736147" ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942"/>
+        <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047" ymin="-33.95702588572736147"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="282.372,186.105,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="9.50144,5.50066,mm" followPreset="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.15,mm" positionLock="false" blendMode="0" zValue="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" mapFlags="0" positionOnPage="9.50144,5.50066,mm" frameJoinStyle="round" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Main Map" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" position="9.50144,5.50066,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.372,186.105,mm" mapFlags="0" positionLock="false" positionOnPage="9.50144,5.50066,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32546,11 +32550,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95900000000000318" ymax="-33.89975491900725046" xmax="18.45389078049076304" xmin="18.36400000000000077"/>
+        <Extent xmin="18.36400000000000077" xmax="18.45389078049076304" ymax="-33.89975491900725046" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32558,7 +32562,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -32626,7 +32630,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32634,7 +32638,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -32685,12 +32689,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -32698,7 +32702,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32733,7 +32737,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -32755,8 +32759,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" inverted="0" show="1" name="Overview 1" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3">
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" centered="0">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -32770,7 +32774,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="103,34,144,26" type="QString"/>
@@ -32819,10 +32823,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -32847,13 +32851,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortKey="&quot;Sort&quot;" coverageLayerName="all_routes" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" sortAscending="1" filterFeatures="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" enabled="1" hideCoverage="0" coverageLayerName="all_routes"/>
     </Layout>
-    <Layout printResolution="120" worldFileMap="" units="mm" name="Marshal Plan A1">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshal Plan A1" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32861,7 +32865,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32895,9 +32899,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="594,841,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" blendMode="0" opacity="1" size="594,841,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -32910,7 +32914,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -32918,7 +32922,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32955,9 +32959,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="8" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="4,4,mm" titleAlignment="1" position="25.5925,18.7971,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="25.5925,18.7971,mm" rasterBorderWidth="0" frame="false" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="25.5925,18.7971,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="8" background="true" symbolWidth="7" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" opacity="1" position="25.5925,18.7971,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="4,4,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32971,31 +32975,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="1" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
@@ -33009,9 +33013,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="91.9494,15.0649,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.2963,808.939,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="7" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" id="" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" position="5.2963,808.939,mm" blendMode="0" opacity="1" size="91.9494,15.0649,mm" positionLock="true" positionOnPage="5.2963,808.939,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="7" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33024,12 +33028,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33037,7 +33041,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33072,7 +33076,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33082,9 +33086,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="56.6212,15.3656,mm" groupUuid="" frame="false" excludeFromExports="0" position="430.403,825.052,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="5" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" id="" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" referencePoint="0" labelText="REVISION 1.2" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" position="430.403,825.052,mm" blendMode="0" opacity="1" size="56.6212,15.3656,mm" positionLock="true" positionOnPage="430.403,825.052,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33097,12 +33101,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33110,7 +33114,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33145,7 +33149,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33155,9 +33159,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="114.848,15.0635,mm" groupUuid="" frame="false" excludeFromExports="0" position="372.175,808.942,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="4" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" position="372.175,808.942,mm" blendMode="0" opacity="1" size="114.848,15.0635,mm" positionLock="true" positionOnPage="372.175,808.942,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33170,12 +33174,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33183,7 +33187,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33218,7 +33222,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33228,9 +33232,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="8" pictureHeight="63.9757" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" size="100.498,63.9757,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="489.557,775.395,mm" mapUuid="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" file="../Gun_Run_Logo.png" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" id="" positionOnPage="489.557,775.395,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="63.9757" size="100.498,63.9757,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="489.557,775.395,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="63.5856" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33250,9 +33254,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="481.428,0.606138,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.4463,824.155,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" id="" positionOnPage="5.4463,824.155,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" blendMode="0" opacity="1" size="481.428,0.606138,mm" positionLock="true" positionOnPage="5.4463,824.155,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33265,7 +33269,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33273,7 +33277,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -33308,9 +33312,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="584.759,811.213,mm" groupUuid="" frame="true" followPresetName="Marshal overview" excludeFromExports="0" position="3.94474,5.25965,mm" followPreset="true" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" mapFlags="0" positionOnPage="3.94474,5.25965,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="3.94474,5.25965,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="584.759,811.213,mm" mapFlags="0" positionLock="true" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33339,14 +33343,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
+        <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -33357,13 +33361,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" coverageLayerName="complete_marshal_overview" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="complete_marshal_overview"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="" units="mm" name="Access Roads">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="144" name="Access Roads" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33371,7 +33375,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33405,9 +33409,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -33420,7 +33424,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -33428,7 +33432,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33464,12 +33468,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="15" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="34.45,40.8,mm" titleAlignment="1" position="244.484,130.172,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" equalColumnWidth="0" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="244.484,130.172,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="244.484,130.172,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" frame="true" equalColumnWidth="0" itemRotation="0" zValue="15" background="true" symbolWidth="7" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" opacity="1" position="244.484,130.172,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="34.45,40.8,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33483,31 +33487,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Residents Access" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" expanded="1" name="residents_access_roads" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -33519,9 +33523,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="194.851,7.272,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.37446,191.81,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" id="" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33534,12 +33538,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="14" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33547,7 +33551,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33582,7 +33586,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33592,9 +33596,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="57.4836,6.8714,mm" groupUuid="" frame="false" excludeFromExports="0" position="204.225,191.81,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="6" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" id="" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" referencePoint="0" labelText="REVISION 1.1" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33607,12 +33611,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33620,7 +33624,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33655,7 +33659,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33665,9 +33669,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="51.6706,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="210.038,199.082,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="5" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33680,12 +33684,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33693,7 +33697,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33728,7 +33732,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33738,9 +33742,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="17.4718" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" size="29.7523,17.4718,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="262.196,188.218,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="../Gun_Run_Logo.png" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" id="" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33760,9 +33764,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="251.959,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.59946,198.832,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" id="" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33775,7 +33779,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33783,7 +33787,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -33818,9 +33822,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="67.7828,166.874,mm" groupUuid="" frame="true" followPresetName="Access Routes" excludeFromExports="0" position="5.86559,4.09761,mm" followPreset="true" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" mapFlags="0" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33864,7 +33868,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
+        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" 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>
@@ -33879,9 +33883,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33889,7 +33893,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -33957,7 +33961,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33965,7 +33969,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -34016,12 +34020,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -34029,7 +34033,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34064,7 +34068,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -34088,14 +34092,14 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="282.012,175.592,mm" groupUuid="" frame="true" followPresetName="Access Routes" excludeFromExports="0" position="9.44946,9.08557,mm" followPreset="true" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.15,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" mapFlags="0" positionOnPage="9.44946,9.08557,mm" frameJoinStyle="round" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" position="9.44946,9.08557,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,175.592,mm" mapFlags="0" positionLock="true" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34124,7 +34128,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
+        <Extent xmin="18.37000000000000099" xmax="18.42303507276415431" 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>
@@ -34139,9 +34143,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34149,7 +34153,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -34217,7 +34221,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34225,7 +34229,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -34276,12 +34280,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -34289,7 +34293,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34324,7 +34328,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -34348,10 +34352,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -34369,13 +34373,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="1" hideCoverage="1" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm" name="Golf Course Access">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34383,7 +34387,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34417,9 +34421,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -34432,7 +34436,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -34440,7 +34444,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34476,12 +34480,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="194.851,7.272,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.37446,191.81,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" id="" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34494,12 +34498,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="14" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34507,7 +34511,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34542,7 +34546,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34552,9 +34556,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="57.4836,6.8714,mm" groupUuid="" frame="false" excludeFromExports="0" position="204.225,191.81,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="6" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" id="" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34567,12 +34571,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34580,7 +34584,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34615,7 +34619,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34625,9 +34629,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="51.6706,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="210.038,199.082,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="5" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34640,12 +34644,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34653,7 +34657,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34688,7 +34692,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34698,9 +34702,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="17.4718" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" size="29.7523,17.4718,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="262.196,188.218,mm" mapUuid="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="../Gun_Run_Logo.png" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" id="" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34720,9 +34724,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="251.959,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.59946,198.832,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" id="" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34735,7 +34739,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34743,7 +34747,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -34778,9 +34782,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="282.012,182.649,mm" groupUuid="" frame="false" followPresetName="" excludeFromExports="0" position="9.44946,7.25098,mm" followPreset="false" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.15,mm" positionLock="false" blendMode="0" zValue="1" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" mapFlags="0" positionOnPage="9.44946,7.25098,mm" frameJoinStyle="round" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" position="9.44946,7.25098,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,182.649,mm" mapFlags="0" positionLock="false" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false" groupUuid="" followPreset="false" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="" outlineWidthM="0.15,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34809,7 +34813,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
+        <Extent xmin="18.40103928699269886" xmax="18.40919746780259914" 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>
@@ -34824,9 +34828,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34834,7 +34838,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -34902,7 +34906,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34910,7 +34914,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -34961,12 +34965,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -34974,7 +34978,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35009,7 +35013,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -35033,10 +35037,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -35054,13 +35058,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="0" hideCoverage="1" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="120" worldFileMap="" units="mm" name="Marshal Plan">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshal Plan" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35068,7 +35072,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35102,9 +35106,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,420,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" position="0,0,mm" blendMode="0" opacity="1" size="297,420,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -35117,7 +35121,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -35125,7 +35129,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35162,9 +35166,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="1" size="23.5967,8.3142,mm" groupUuid="" frame="false" excludeFromExports="0" position="112.086,406.476,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="9" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" id="" labelText="Page [% &quot;page&quot; %] " positionOnPage="112.086,406.476,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" referencePoint="0" labelText="Page [% &quot;page&quot; %] " marginX="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" position="112.086,406.476,mm" blendMode="0" opacity="1" size="23.5967,8.3142,mm" positionLock="true" positionOnPage="112.086,406.476,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="9" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35177,12 +35181,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35190,7 +35194,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35225,7 +35229,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35235,9 +35239,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="27.7839,7.51682,mm" groupUuid="" frame="false" excludeFromExports="0" position="214.292,406.874,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" id="" labelText="REVISION 4.0" positionOnPage="214.292,406.874,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" referencePoint="0" labelText="REVISION 4.1" marginX="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" position="214.292,406.874,mm" blendMode="0" opacity="1" size="27.7839,7.51682,mm" positionLock="true" positionOnPage="214.292,406.874,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35250,12 +35254,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35263,7 +35267,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35298,7 +35302,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35308,9 +35312,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="7" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="21.6797,33,mm" titleAlignment="1" position="15.6525,12.5708,mm" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="15.6525,12.5708,mm" rasterBorderWidth="0" frame="false" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="15.6525,12.5708,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="7" background="true" symbolWidth="7" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" opacity="1" position="15.6525,12.5708,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="21.6797,33,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35324,31 +35328,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="1" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -35362,9 +35366,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="45.1194,8.13137,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.69321,398.344,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="6" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" id="" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,398.344,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" position="5.69321,398.344,mm" blendMode="0" opacity="1" size="45.1194,8.13137,mm" positionLock="true" positionOnPage="5.69321,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35377,12 +35381,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35390,7 +35394,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35425,7 +35429,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35435,9 +35439,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="1" size="118.192,7.80192,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.69321,406.988,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="5" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="5.69321,406.988,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" position="5.69321,406.988,mm" blendMode="0" opacity="1" size="118.192,7.80192,mm" positionLock="true" positionOnPage="5.69321,406.988,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35450,12 +35454,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35463,7 +35467,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35498,7 +35502,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35508,9 +35512,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="1" size="93.5757,8.13167,mm" groupUuid="" frame="false" excludeFromExports="0" position="148.501,398.344,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="4" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="148.501,398.344,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" position="148.501,398.344,mm" blendMode="0" opacity="1" size="93.5757,8.13167,mm" positionLock="true" positionOnPage="148.501,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35523,12 +35527,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35536,7 +35540,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35571,7 +35575,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35581,9 +35585,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="8" pictureHeight="26.4325" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" size="49.3143,31.2967,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="243.319,382.696,mm" mapUuid="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" file="../GunRun2022_250.png" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" id="" positionOnPage="243.319,382.696,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" position="243.319,382.696,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,31.2967,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.319,382.696,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35603,9 +35607,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="236.083,0.14328,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.84321,406.626,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" id="" positionOnPage="5.84321,406.626,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" position="5.84321,406.626,mm" blendMode="0" opacity="1" size="236.083,0.14328,mm" positionLock="true" positionOnPage="5.84321,406.626,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35618,7 +35622,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35626,7 +35630,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -35661,9 +35665,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="286.94,392.396,mm" groupUuid="" frame="false" followPresetName="Marshal overview" excludeFromExports="0" position="5.03,5.9483,mm" followPreset="true" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" mapFlags="0" positionOnPage="5.03,5.9483,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="5.03,5.9483,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="286.94,392.396,mm" mapFlags="0" positionLock="true" positionOnPage="5.03,5.9483,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal plan" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35692,14 +35696,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94797288016832226" ymax="-33.9248732774534929" xmax="18.38613924055453452" xmin="18.36924763341120581"/>
+        <Extent xmin="18.39785407807089612" xmax="18.41474568521422484" ymax="-33.89580042337001231" ymin="-33.91890002608484167"/>
         <LayerSet/>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -35717,14 +35721,14 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" coverageLayerName="marshal_overviews" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="marshal_overviews"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
-  <ProjectViewSettings UseProjectScales="0" rotation="0">
+  <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymin="-33.90871482956616489" ymax="-33.90423630387739706" xmax="18.40994200790283131" xmin="18.40161633768571292">
+    <DefaultViewExtent xmin="18.38171185633030547" xmax="18.43166587763301578" ymax="-33.89601380088749494" ymin="-33.92288495502011614">
       <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>
@@ -35738,13 +35742,13 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStepUnit="h" timeStep="1"/>
+  <ProjectTimeSettings timeStepUnit="h" frameRate="1" timeStep="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
diff --git a/GIS Base Map/Gun Run.qgs~ b/GIS Base Map/Gun Run.qgs~
index 919d31d..f1d21b8 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="2022-09-11T23:06:57" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen">
+<qgis saveDateTime="2022-09-12T08:32:26" projectname="Gun Run" version="3.26.3-Buenos Aires" saveUserFull="Timothy Allen" saveUser="tim">
   <homePath path=""/>
   <title>Gun Run</title>
   <transaction mode="Disabled"/>
@@ -21,11 +21,11 @@
     <customproperties>
       <Option/>
     </customproperties>
-    <layer-tree-group expanded="1" groupLayer="" name="Marshals" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Marshals" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" providerKey="ogr" expanded="1" name="marshal_positions" legend_exp="" patch_size="0,0" source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./marshal_positions.shp|layername=marshal_positions" checked="Qt::Checked" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" patch_size="0,0" expanded="1" providerKey="ogr" name="marshal_positions" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshal_positions [460]" type="QString"/>
@@ -36,26 +36,26 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="extra_security20170921130834191" providerKey="ogr" expanded="1" name="extra_security" legend_exp="" patch_size="0,0" source="./extra_security.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./extra_security.shp" checked="Qt::Unchecked" id="extra_security20170921130834191" patch_size="0,0" expanded="1" providerKey="ogr" name="extra_security" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshals_by_position20161003112326575" providerKey="delimitedtext" expanded="1" name="marshals_by_position" legend_exp="" patch_size="0,0" source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes" checked="Qt::Unchecked" id="marshals_by_position20161003112326575" patch_size="0,0" expanded="1" providerKey="delimitedtext" name="marshals_by_position" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="marshals_by_position" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" providerKey="virtual" expanded="1" name="complete_marshal_overview" legend_exp="" patch_size="0,0" source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" checked="Qt::Unchecked" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" patch_size="0,0" expanded="1" providerKey="virtual" name="complete_marshal_overview" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" providerKey="ogr" expanded="0" name="marshal_overviews" legend_exp="" patch_size="0,0" source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./marshal overviews.shp|layername=marshal overviews" checked="Qt::Unchecked" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" patch_size="0,0" expanded="0" providerKey="ogr" name="marshal_overviews" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="legend/expressionFilter" value="" type="QString"/>
@@ -64,11 +64,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Fencing and Cones" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Fencing and Cones" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" name="fencing" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="fencing" type="QString"/>
@@ -78,21 +78,21 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" providerKey="virtual" expanded="1" name="fence_groups" legend_exp="" patch_size="-1,-1" source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" checked="Qt::Unchecked" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" patch_size="-1,-1" expanded="1" providerKey="virtual" name="fence_groups" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-group expanded="1" groupLayer="" name="Markers" checked="Qt::Checked">
+      <layer-tree-group checked="Qt::Checked" expanded="1" name="Markers" groupLayer="">
         <customproperties>
           <Option/>
         </customproperties>
-        <layer-tree-layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" providerKey="memory" expanded="1" name="route_markers" legend_exp="" patch_size="-1,-1" source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={84131c94-5de5-48de-82a7-537bc489c533}" checked="Qt::Checked" legend_split_behavior="0">
+        <layer-tree-layer source="memory?geometry=Point&amp;crs=EPSG:4326&amp;field=Name:String(254,0)&amp;field=descriptio:String(254,0)&amp;field=timestamp:String(24,0)&amp;field=begin:String(24,0)&amp;field=end:String(24,0)&amp;field=Distance:String(10,0)&amp;field=RouteLen:int8(10,0)&amp;field=Source:String(20,0)&amp;field=Sort:Integer(2,0)&amp;field=day:Integer(1,0)&amp;field=length_km:double%20precision(-1,0)&amp;field=length_m:double%20precision(-1,0)&amp;field=org_fid:integer(0,0)&amp;field=distance:double(0,0)&amp;field=quadrant:string(10,0)&amp;uid={ec24be51-a272-427e-8ee9-16cf66eedb24}" checked="Qt::Checked" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" patch_size="-1,-1" expanded="1" providerKey="memory" name="route_markers" legend_split_behavior="0" legend_exp="">
           <customproperties>
             <Option type="Map">
               <Option name="cached_name" value="route_markers" type="QString"/>
@@ -100,7 +100,7 @@
           </customproperties>
         </layer-tree-layer>
       </layer-tree-group>
-      <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="all_routes" type="QString"/>
@@ -110,18 +110,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-layer id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" providerKey="ogr" expanded="0" name="timelapse" legend_exp="" patch_size="0,0" source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" legend_split_behavior="0">
+    <layer-tree-layer source="./timelapse.shp|layername=timelapse|subset=&quot;first_runn&quot; &lt; '06:59:45.000000' AND &quot;last_runne&quot; >= '06:59:35.000000' " checked="Qt::Unchecked" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" patch_size="0,0" expanded="0" providerKey="ogr" name="timelapse" legend_split_behavior="0" legend_exp="">
       <customproperties>
         <Option type="Map">
           <Option name="cached_name" value="timelapse" type="QString"/>
         </Option>
       </customproperties>
     </layer-tree-layer>
-    <layer-tree-group expanded="1" groupLayer="" name="Feeding Stations" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Feeding Stations" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="water_tables20170921142016467" providerKey="ogr" expanded="1" name="water_tables" legend_exp="" patch_size="0,0" source="./water_tables.shp" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./water_tables.shp" checked="Qt::Checked" id="water_tables20170921142016467" patch_size="0,0" expanded="1" providerKey="ogr" name="water_tables" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="water_tables" type="QString"/>
@@ -130,18 +130,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" groupLayer="" name="Ask Me" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Ask Me" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" expanded="1" name="poi_labels" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Unchecked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="poi_labels" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" expanded="1" name="directions_to_start" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Unchecked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="directions_to_start" type="QString"/>
@@ -149,18 +149,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" groupLayer="" name="Residents Access" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Residents Access" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" providerKey="ogr" expanded="1" name="mayor" legend_exp="" patch_size="0,0" source="./mayor.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./mayor.shp" checked="Qt::Unchecked" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="mayor" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="mayor" type="QString"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" providerKey="ogr" expanded="1" name="viplabels" legend_exp="" patch_size="0,0" source="./viplabels.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./viplabels.shp" checked="Qt::Unchecked" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" patch_size="0,0" expanded="1" providerKey="ogr" name="viplabels" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="viplabels" type="QString"/>
@@ -168,7 +168,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" providerKey="ogr" expanded="1" name="vipaccess" legend_exp="" patch_size="0,0" source="./vipaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./vipaccess.shp" checked="Qt::Unchecked" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" patch_size="0,0" expanded="1" providerKey="ogr" name="vipaccess" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="vipaccess" type="QString"/>
@@ -176,12 +176,12 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" providerKey="ogr" expanded="0" name="golfaccess" legend_exp="" patch_size="0,0" source="./golfaccess.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./golfaccess.shp" checked="Qt::Unchecked" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" patch_size="0,0" expanded="0" providerKey="ogr" name="golfaccess" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" expanded="1" name="residents_access_roads" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Unchecked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="residents_access_roads" type="QString"/>
@@ -189,17 +189,17 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" providerKey="ogr" expanded="1" name="residents_access" legend_exp="" patch_size="0,0" source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./residents_access.shp|layername=residents_access" checked="Qt::Unchecked" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option/>
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="OSM data" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="OSM data" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" providerKey="ogr" expanded="0" name="osm_roads" legend_exp="" patch_size="0,0" source="./osm_roads.shp" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./osm_roads.shp" checked="Qt::Checked" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" patch_size="0,0" expanded="0" providerKey="ogr" name="osm_roads" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_roads [3887]" type="QString"/>
@@ -208,7 +208,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" providerKey="ogr" expanded="1" name="osm_places" legend_exp="" patch_size="0,0" source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./osm_places.shp|layername=osm_places" checked="Qt::Checked" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" patch_size="0,0" expanded="1" providerKey="ogr" name="osm_places" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="osm_places [7]" type="QString"/>
@@ -218,18 +218,18 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Start and Finish pages" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="1" name="Start and Finish pages" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" providerKey="ogr" expanded="1" name="data-comments" legend_exp="" patch_size="0,0" source="./data-comments.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./data-comments.shp" checked="Qt::Unchecked" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" patch_size="0,0" expanded="1" providerKey="ogr" name="data-comments" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" providerKey="ogr" expanded="1" name="start_finish_area" legend_exp="" patch_size="0,0" source="./start_finish_area.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./start_finish_area.shp" checked="Qt::Unchecked" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" patch_size="0,0" expanded="1" providerKey="ogr" name="start_finish_area" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="expandedLegendNodes" type="invalid"/>
@@ -237,11 +237,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="0" groupLayer="" name="Elevation" checked="Qt::Unchecked">
+    <layer-tree-group checked="Qt::Unchecked" expanded="0" name="Elevation" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" providerKey="ogr" expanded="1" name="capetownelevation-1m" legend_exp="" patch_size="0,0" source="./capetownelevation-1m.shp" checked="Qt::Unchecked" legend_split_behavior="0">
+      <layer-tree-layer source="./capetownelevation-1m.shp" checked="Qt::Unchecked" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" patch_size="0,0" expanded="1" providerKey="ogr" name="capetownelevation-1m" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="showFeatureCount" value="1" type="QString"/>
@@ -249,11 +249,11 @@
         </customproperties>
       </layer-tree-layer>
     </layer-tree-group>
-    <layer-tree-group expanded="1" groupLayer="" name="Map" checked="Qt::Checked">
+    <layer-tree-group checked="Qt::Checked" expanded="1" name="Map" groupLayer="">
       <customproperties>
         <Option/>
       </customproperties>
-      <layer-tree-layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" providerKey="gdal" expanded="0" name="GDAL-City of Cape Town 2015 Aerial" legend_exp="" patch_size="0,0" source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="./GDAL-City of Cape Town 2015 Aerial.xml" checked="Qt::Checked" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" patch_size="0,0" expanded="0" providerKey="gdal" name="GDAL-City of Cape Town 2015 Aerial" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="GDAL-City of Cape Town 2015 Aerial" type="QString"/>
@@ -261,7 +261,7 @@
           </Option>
         </customproperties>
       </layer-tree-layer>
-      <layer-tree-layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" providerKey="wms" expanded="1" name="Outlines" legend_exp="" patch_size="0,0" source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" legend_split_behavior="0">
+      <layer-tree-layer source="contextualWMSLegend=0&amp;crs=EPSG:3857&amp;dpiMode=7&amp;featureCount=10&amp;format=image/png&amp;layers=ciry26ojy003tgynmznkc1a6q&amp;styles=default&amp;tileMatrixSet=GoogleMapsCompatible&amp;url=https://api.mapbox.com/styles/v1/ragtagtag/ciry26ojy003tgynmznkc1a6q/wmts?access_token%3Dpk.eyJ1IjoicmFndGFndGFnIiwiYSI6ImNpcnh3bnowbTAwMDUyemw1enBtbm50bTgifQ.WXKQzAfdJjsuQ6P6-BLZhg%2314.88/-33.91505/18.39137" checked="Qt::Checked" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" patch_size="0,0" expanded="1" providerKey="wms" name="Outlines" legend_split_behavior="0" legend_exp="">
         <customproperties>
           <Option type="Map">
             <Option name="cached_name" value="Outlines" type="QString"/>
@@ -298,31 +298,31 @@
       <item>route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e</item>
     </custom-order>
   </layer-tree-group>
-  <snapping-settings enabled="0" self-snapping="1" mode="3" unit="1" scaleDependencyMode="0" tolerance="10" minScale="0" type="1" maxScale="0" intersection-snapping="1">
+  <snapping-settings intersection-snapping="1" tolerance="10" mode="3" scaleDependencyMode="0" enabled="0" type="1" minScale="0" unit="1" self-snapping="1" maxScale="0">
     <individual-layer-settings>
-      <layer-setting enabled="0" id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" units="1" tolerance="12" minScale="0" type="0" maxScale="0"/>
-      <layer-setting enabled="0" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="1" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" units="1" tolerance="20" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="extra_security20170921130834191" units="2" tolerance="0" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="water_tables20170921142016467" units="2" tolerance="0" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" units="1" tolerance="12" minScale="0" type="0" maxScale="0"/>
-      <layer-setting enabled="0" id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
-      <layer-setting enabled="0" id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" units="1" tolerance="12" minScale="0" type="1" maxScale="0"/>
-      <layer-setting enabled="0" id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" units="1" tolerance="12" minScale="0" type="2" maxScale="0"/>
+      <layer-setting id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" tolerance="12" enabled="0" type="0" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="water_tables20170921142016467" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
+      <layer-setting id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" tolerance="20" enabled="1" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d" tolerance="12" enabled="0" type="1" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" tolerance="12" enabled="0" type="2" units="1" minScale="0" maxScale="0"/>
+      <layer-setting id="extra_security20170921130834191" tolerance="0" enabled="0" type="2" units="2" minScale="0" maxScale="0"/>
     </individual-layer-settings>
   </snapping-settings>
   <relations/>
@@ -330,10 +330,10 @@
   <mapcanvas name="theMapCanvas" annotationsVisible="1">
     <units>degrees</units>
     <extent>
-      <xmin>18.40161633768571292</xmin>
-      <ymin>-33.90865669289104289</ymin>
-      <xmax>18.40994200790283131</xmax>
-      <ymax>-33.90429444055251906</ymax>
+      <xmin>18.37956087983462439</xmin>
+      <ymin>-33.9203851584736924</ymin>
+      <xmax>18.4295149011373347</xmax>
+      <ymax>-33.89421164444254941</ymax>
     </extent>
     <rotation>0</rotation>
     <destinationsrs>
@@ -354,161 +354,161 @@
   </mapcanvas>
   <projectModels/>
   <legend updateDrawingOrder="true">
-    <legendgroup open="true" name="Marshals" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" name="marshal_positions" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Marshals">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="marshal_positions" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="extra_security" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="extra_security" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="extra_security20170921130834191"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="extra_security20170921130834191"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="marshals_by_position" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="marshals_by_position" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshals_by_position20161003112326575"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshals_by_position20161003112326575"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="complete_marshal_overview" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="complete_marshal_overview" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" name="marshal_overviews" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="marshal_overviews" showFeatureCount="0">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Fencing and Cones" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="fencing" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Fencing and Cones">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="fencing" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="fence_groups" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="fence_groups" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Routes" checked="Qt::Checked">
-      <legendgroup open="true" name="Markers" checked="Qt::Checked">
-        <legendlayer open="true" drawingOrder="-1" name="route_markers" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Routes">
+      <legendgroup checked="Qt::Checked" open="true" name="Markers">
+        <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="route_markers" showFeatureCount="0">
           <filegroup open="true" hidden="false">
-            <legendlayerfile isInOverview="0" visible="1" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+            <legendlayerfile visible="1" isInOverview="0" layerid="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
           </filegroup>
         </legendlayer>
       </legendgroup>
-      <legendlayer open="true" drawingOrder="-1" name="all_routes" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="all_routes" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendlayer open="false" drawingOrder="-1" name="timelapse" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="timelapse" showFeatureCount="0">
       <filegroup open="false" hidden="false">
-        <legendlayerfile isInOverview="0" visible="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
+        <legendlayerfile visible="0" isInOverview="0" layerid="timelapse_17eb9724_2712_4969_8ec8_1b7ae9fa989f"/>
       </filegroup>
     </legendlayer>
-    <legendgroup open="true" name="Feeding Stations" checked="Qt::Checked">
-      <legendlayer open="true" drawingOrder="-1" name="water_tables" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Feeding Stations">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="water_tables" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="water_tables20170921142016467"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="water_tables20170921142016467"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Ask Me" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="poi_labels" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Ask Me">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="poi_labels" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="directions_to_start" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="directions_to_start" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Residents Access" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="mayor" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Residents Access">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="mayor" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="mayor_ad28ef70_c3dc_40d6_b635_7edd5d68c6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="viplabels" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="viplabels" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="viplabels_685cbe5d_48e1_4f7c_bb2d_7c883b071ae0"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="vipaccess" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="vipaccess" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="vipaccess_10c645f4_808f_4387_942e_2d7a57aab6ea"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="false" drawingOrder="-1" name="golfaccess" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="false" name="golfaccess" showFeatureCount="0">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="golfaccess_6737d44a_edd6_49c4_9060_e610f0ad004d"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="residents_access_roads" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access_roads" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="residents_access" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="residents_access" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="OSM data" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" name="osm_roads" showFeatureCount="1" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="OSM data">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="osm_roads" showFeatureCount="1">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="osm_places" showFeatureCount="1" checked="Qt::Checked">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="osm_places" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Start and Finish pages" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="data-comments" showFeatureCount="0" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="true" name="Start and Finish pages">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="data-comments" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="start_finish_area" showFeatureCount="0" checked="Qt::Unchecked">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="start_finish_area" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="false" name="Elevation" checked="Qt::Unchecked">
-      <legendlayer open="true" drawingOrder="-1" name="capetownelevation-1m" showFeatureCount="1" checked="Qt::Unchecked">
+    <legendgroup checked="Qt::Unchecked" open="false" name="Elevation">
+      <legendlayer checked="Qt::Unchecked" drawingOrder="-1" open="true" name="capetownelevation-1m" showFeatureCount="1">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
+          <legendlayerfile visible="0" isInOverview="0" layerid="capetownelevation_1m_21f68a71_b556_47fc_bc73_9a39fd1b86b1"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
-    <legendgroup open="true" name="Map" checked="Qt::Checked">
-      <legendlayer open="false" drawingOrder="-1" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0" checked="Qt::Checked">
+    <legendgroup checked="Qt::Checked" open="true" name="Map">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="false" name="GDAL-City of Cape Town 2015 Aerial" showFeatureCount="0">
         <filegroup open="false" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
         </filegroup>
       </legendlayer>
-      <legendlayer open="true" drawingOrder="-1" name="Outlines" showFeatureCount="0" checked="Qt::Checked">
+      <legendlayer checked="Qt::Checked" drawingOrder="-1" open="true" name="Outlines" showFeatureCount="0">
         <filegroup open="true" hidden="false">
-          <legendlayerfile isInOverview="0" visible="1" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+          <legendlayerfile visible="1" isInOverview="0" layerid="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
         </filegroup>
       </legendlayer>
     </legendgroup>
   </legend>
   <mapViewDocks/>
-  <main-annotation-layer autoRefreshTime="0" refreshOnNotifyMessage="" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" type="annotation">
+  <main-annotation-layer refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="annotation" refreshOnNotifyMessage="">
     <id>Annotations_246fb3fe_ae9e_4941_a02a_224c6f83119c</id>
     <datasource></datasource>
     <keywordList>
@@ -559,7 +559,7 @@
     <paintEffect/>
   </main-annotation-layer>
   <projectlayers>
-    <maplayer autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" type="raster" maxScale="100000">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="100000" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
       <extent>
         <xmin>-20037508.33999999985098839</xmin>
         <ymin>-20037508.33999999985098839</ymin>
@@ -624,7 +624,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -649,13 +649,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" zscale="1" band="1" symbology="Line">
+      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -664,7 +664,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -672,7 +672,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -740,7 +740,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -748,7 +748,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="152,125,183,255" type="QString"/>
@@ -804,9 +804,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer alphaBand="-1" redBand="1" opacity="0.5" nodataColor="" greenBand="2" type="multibandcolor" blueBand="3">
+        <rasterrenderer opacity="0.5" nodataColor="" greenBand="2" blueBand="3" type="multibandcolor" redBand="1" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -817,14 +817,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" colorizeStrength="100" colorizeOn="0" saturation="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" styleCategories="AllStyleCategories" type="raster" maxScale="0">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" type="raster" minScale="1e+08" maxScale="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories">
       <extent>
         <xmin>-20037508.34278924390673637</xmin>
         <ymin>-20037508.62692909315228462</ymin>
@@ -889,7 +889,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -912,13 +912,13 @@
         <Searchable>0</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" fetchMode="0">
+      <temporal mode="0" fetchMode="0" enabled="0">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation enabled="0" zoffset="0" zscale="1" band="1" symbology="Line">
+      <elevation symbology="Line" enabled="0" band="1" zscale="1" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -927,7 +927,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -935,7 +935,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1003,7 +1003,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1011,7 +1011,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="225,89,137,255" type="QString"/>
@@ -1067,9 +1067,9 @@
       </pipe-data-defined-properties>
       <pipe>
         <provider>
-          <resampling enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour" zoomedOutResamplingMethod="nearestNeighbour"/>
+          <resampling zoomedOutResamplingMethod="nearestNeighbour" enabled="false" maxOversampling="2" zoomedInResamplingMethod="nearestNeighbour"/>
         </provider>
-        <rasterrenderer alphaBand="-1" opacity="0.75" nodataColor="" band="1" type="singlebandcolordata">
+        <rasterrenderer opacity="0.75" nodataColor="" band="1" type="singlebandcolordata" alphaBand="-1">
           <rasterTransparency/>
           <minMaxOrigin>
             <limits>None</limits>
@@ -1080,14 +1080,14 @@
             <stdDevFactor>2</stdDevFactor>
           </minMaxOrigin>
         </rasterrenderer>
-        <brightnesscontrast brightness="0" gamma="1" contrast="0"/>
-        <huesaturation grayscaleMode="0" invertColors="0" colorizeBlue="128" colorizeRed="255" colorizeGreen="128" colorizeStrength="100" colorizeOn="0" saturation="0"/>
+        <brightnesscontrast gamma="1" contrast="0" brightness="0"/>
+        <huesaturation colorizeOn="0" colorizeStrength="100" colorizeRed="255" invertColors="0" colorizeGreen="128" colorizeBlue="128" grayscaleMode="0" saturation="0"/>
         <rasterresampler maxOversampling="2"/>
         <resamplingStage>resamplingFilter</resamplingStage>
       </pipe>
       <blendMode>0</blendMode>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.37527226735897301</xmin>
         <ymin>-33.95648400000000322</ymin>
@@ -1152,7 +1152,7 @@
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -1166,8 +1166,8 @@
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="length_km" comment="" expression="$length * 100" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="length_m" comment="" expression="$length * 100 * 1000" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="default">
         <map-layer-style name="default"/>
@@ -1180,13 +1180,13 @@
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="RouteLen" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="RouteLen" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -1195,7 +1195,7 @@
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1203,7 +1203,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1271,7 +1271,7 @@
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1279,7 +1279,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="229,182,54,255" type="QString"/>
@@ -1315,7 +1315,7 @@
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1323,7 +1323,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -1375,25 +1375,25 @@
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}" filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" symbol="0" description="Only show when active in Atlas" label="Active Routes" checkstate="0">
-            <rule key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}" filter="&quot;Source&quot; = '21KM'" symbol="1" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0"/>
-            <rule key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}" filter="&quot;Source&quot; = '10KM'" symbol="2" description="This should be disabled, since it's only for legends" label="10KM" checkstate="0"/>
-            <rule key="{bdafe9b2-4918-427d-89be-41870f96981f}" filter="&quot;Source&quot; = '5KM'" symbol="3" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0"/>
-            <rule key="{151f553a-04cc-4e24-b74d-37d5618f5223}" filter="&quot;Source&quot; = 'Trail'" symbol="4" description="This should be disabled, since it's only for legends" label="Trail" checkstate="0"/>
+          <rule filter="$id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' )" checkstate="0" symbol="0" description="Only show when active in Atlas" label="Active Routes" key="{7132fb4b-2762-4af3-8eb0-4be2b1c0cf6c}">
+            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="1" description="This should be disabled, since it's only for legends" label="21KM" key="{a2b868a3-1709-41cf-b920-118bdfa2d5d3}"/>
+            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="2" description="This should be disabled, since it's only for legends" label="10KM" key="{17faeda5-eb56-4a1b-b784-639b6c7334d2}"/>
+            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="3" description="This should be disabled, since it's only for legends" label="5KM" key="{bdafe9b2-4918-427d-89be-41870f96981f}"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="4" description="This should be disabled, since it's only for legends" label="Trail" key="{151f553a-04cc-4e24-b74d-37d5618f5223}"/>
           </rule>
-          <rule key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" label="Show by day">
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '21KM'" symbol="6" description="This should be disabled, since it's only for legends" label="21KM" checkstate="0"/>
-            <rule key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}" filter="&quot;Source&quot; = '10KM'" symbol="7" description="This should be disabled, since it's only for legends" label="10KM" checkstate="0"/>
-            <rule key="{871a9276-8278-4528-911c-7e434c0885d3}" filter="&quot;Source&quot; = '5KM'" symbol="8" description="This should be disabled, since it's only for legends" label="5KM" checkstate="0"/>
-            <rule key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}" filter="&quot;Source&quot; = 'Trail'" symbol="9" description="This should be disabled, since it's only for legends" label="Trail" checkstate="0"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; ) AND ( $id =  @atlas_featureid OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$|fenc|cone)' ) )" symbol="5" description="Only show when active in Atlas" label="Show by day" key="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}">
+            <rule filter="&quot;Source&quot; = '21KM'" checkstate="0" symbol="6" description="This should be disabled, since it's only for legends" label="21KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; = '10KM'" checkstate="0" symbol="7" description="This should be disabled, since it's only for legends" label="10KM" key="{f4cd7b17-1c37-4e57-ac3f-835df757b1ed}"/>
+            <rule filter="&quot;Source&quot; = '5KM'" checkstate="0" symbol="8" description="This should be disabled, since it's only for legends" label="5KM" key="{871a9276-8278-4528-911c-7e434c0885d3}"/>
+            <rule filter="&quot;Source&quot; = 'Trail'" checkstate="0" symbol="9" description="This should be disabled, since it's only for legends" label="Trail" key="{82ba5c12-5eaf-4bf1-af1a-89035ce48b3a}"/>
           </rule>
-          <rule key="{95b90b1e-90e8-4f30-830e-b2025d38b822}" symbol="10" label="Always show" checkstate="0"/>
-          <rule key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}" filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="11" label="Always show by day" checkstate="0"/>
+          <rule checkstate="0" symbol="10" label="Always show" key="{95b90b1e-90e8-4f30-830e-b2025d38b822}"/>
+          <rule filter="regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="11" label="Always show by day" key="{ca3590cd-5839-41e2-824b-eca47a2b7a14}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1401,7 +1401,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1454,7 +1454,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1462,7 +1462,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,0,0,255" type="QString"/>
@@ -1496,7 +1496,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@0@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@0@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1504,7 +1504,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -1547,7 +1547,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -1618,7 +1618,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1660,7 +1660,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1668,7 +1668,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1725,7 +1725,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1767,7 +1767,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1775,7 +1775,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -1833,7 +1833,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -1841,7 +1841,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -1894,7 +1894,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -1902,7 +1902,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -1936,7 +1936,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -1944,7 +1944,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="210,32,39,255" type="QString"/>
@@ -1987,7 +1987,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2058,7 +2058,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2100,7 +2100,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2108,7 +2108,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2165,7 +2165,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2207,7 +2207,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2215,7 +2215,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2273,7 +2273,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="10" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="10" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2281,7 +2281,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2353,7 +2353,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="11" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="11" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2361,7 +2361,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2433,7 +2433,7 @@
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2441,7 +2441,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2494,7 +2494,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2502,7 +2502,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -2536,7 +2536,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@2@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2544,7 +2544,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -2587,7 +2587,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -2658,7 +2658,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2700,7 +2700,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2708,7 +2708,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2765,7 +2765,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2807,7 +2807,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2815,7 +2815,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -2873,7 +2873,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -2881,7 +2881,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -2934,7 +2934,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -2942,7 +2942,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="145,211,55,255" type="QString"/>
@@ -2976,7 +2976,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@3@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@3@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -2984,7 +2984,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="145,211,55,255" type="QString"/>
@@ -3027,7 +3027,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3098,7 +3098,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3140,7 +3140,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3148,7 +3148,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3205,7 +3205,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3247,7 +3247,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3255,7 +3255,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3313,7 +3313,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3321,7 +3321,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3374,7 +3374,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@4@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@4@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3382,7 +3382,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,72,255,255" type="QString"/>
@@ -3416,7 +3416,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@4@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@4@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3424,7 +3424,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,72,255,255" type="QString"/>
@@ -3467,7 +3467,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3538,7 +3538,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3580,7 +3580,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@4@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@4@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3588,7 +3588,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3645,7 +3645,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3687,7 +3687,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@4@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@4@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3695,7 +3695,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -3753,7 +3753,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="5" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -3761,7 +3761,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -3814,7 +3814,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@5@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@5@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -3822,7 +3822,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,0,0,255" type="QString"/>
@@ -3856,7 +3856,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@5@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@5@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -3864,7 +3864,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -3907,7 +3907,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -3978,7 +3978,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4020,7 +4020,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@5@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@5@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4028,7 +4028,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4085,7 +4085,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4127,7 +4127,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@5@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@5@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4135,7 +4135,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4193,7 +4193,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="6" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="6" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4201,7 +4201,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4254,7 +4254,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@6@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@6@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4262,7 +4262,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -4296,7 +4296,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@6@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@6@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -4304,7 +4304,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="210,32,39,255" type="QString"/>
@@ -4347,7 +4347,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4418,7 +4418,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4460,7 +4460,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@6@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@6@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4468,7 +4468,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4525,7 +4525,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4567,7 +4567,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@6@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@6@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4575,7 +4575,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4633,7 +4633,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="7" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="7" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -4641,7 +4641,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4694,7 +4694,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@7@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@7@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4702,7 +4702,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -4736,7 +4736,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@7@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@7@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -4744,7 +4744,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -4787,7 +4787,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -4858,7 +4858,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -4900,7 +4900,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@7@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@7@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -4908,7 +4908,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -4965,7 +4965,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5007,7 +5007,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@7@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@7@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5015,7 +5015,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5073,7 +5073,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="8" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="8" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5081,7 +5081,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5134,7 +5134,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@8@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@8@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5142,7 +5142,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="145,211,55,255" type="QString"/>
@@ -5176,7 +5176,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@8@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@8@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5184,7 +5184,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="145,211,55,255" type="QString"/>
@@ -5227,7 +5227,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5298,7 +5298,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5340,7 +5340,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@8@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@8@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5348,7 +5348,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5405,7 +5405,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5447,7 +5447,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@8@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@8@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5455,7 +5455,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5513,7 +5513,7 @@
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="9" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="9" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -5521,7 +5521,7 @@
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5574,7 +5574,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@9@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@9@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5582,7 +5582,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="0,72,255,255" type="QString"/>
@@ -5616,7 +5616,7 @@
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@9@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@9@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5624,7 +5624,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,72,255,255" type="QString"/>
@@ -5667,7 +5667,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -5738,7 +5738,7 @@
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5780,7 +5780,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@9@2" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@9@2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5788,7 +5788,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5845,7 +5845,7 @@
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -5887,7 +5887,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@9@3" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@9@3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -5895,7 +5895,7 @@
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -5960,14 +5960,14 @@
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{48fee05e-0ef3-420c-825c-567446ab3f47}">
-          <rule key="{d02d4209-0412-4f31-93a5-7f588ba53e66}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="Active routes" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="Active routes" key="{d02d4209-0412-4f31-93a5-7f588ba53e66}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="round($length / 1000, 0)" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round($length / 1000, 0)" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -5975,7 +5975,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -6025,7 +6025,7 @@
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -6033,7 +6033,7 @@
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -6079,7 +6079,7 @@
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -6089,9 +6089,9 @@
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="km_marker()" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="1" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="1" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="km_marker()" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6142,7 +6142,7 @@
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -6180,12 +6180,12 @@
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -6193,7 +6193,7 @@
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -6262,7 +6262,7 @@
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6271,7 +6271,7 @@
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6394,83 +6394,83 @@
         </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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="Sort" index="8" name=""/>
+        <alias field="day" index="9" name=""/>
+        <alias field="length_km" index="10" name=""/>
+        <alias field="length_m" index="11" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="descriptio" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="timestamp" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="begin" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="end" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Source" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Sort" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_km" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_m" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="length_km" comment="" expression="$length * 100" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="length_m" comment="" expression="$length * 100 * 1000" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="length_km" length="-1" subType="0" expression="$length * 100" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="length_m" length="-1" subType="0" expression="$length * 100 * 1000" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;length_m&quot;" sortOrder="1">
+      <attributetableconfig sortExpression="&quot;length_m&quot;" actionWidgetStyle="dropDown" sortOrder="1">
         <columns>
-          <column name="Name" hidden="0" width="152" type="field"/>
-          <column name="descriptio" hidden="0" width="-1" type="field"/>
-          <column name="timestamp" hidden="0" width="-1" type="field"/>
-          <column name="begin" hidden="0" width="163" type="field"/>
-          <column name="end" hidden="0" width="-1" type="field"/>
-          <column name="Distance" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="RouteLen" hidden="0" width="-1" type="field"/>
-          <column name="Source" hidden="0" width="-1" type="field"/>
-          <column name="length_m" hidden="0" width="188" type="field"/>
-          <column name="Sort" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="length_km" hidden="0" width="266" type="field"/>
+          <column width="152" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="163" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="188" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" name="Sort" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="266" hidden="0" name="length_km" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -6548,7 +6548,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>17.99958333333333371</xmin>
         <ymin>-34.00041666666666629</ymin>
@@ -6621,13 +6621,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -6636,7 +6636,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6644,7 +6644,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -6712,7 +6712,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6720,7 +6720,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="196,60,57,255" type="QString"/>
@@ -6756,7 +6756,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6764,7 +6764,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -6816,9 +6816,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -6826,7 +6826,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -6906,7 +6906,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -6936,30 +6936,30 @@ 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 field="ID" index="0" name=""/>
+        <alias field="height" index="1" name=""/>
+        <alias field="elevation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="ID" expression=""/>
-        <default applyOnUpdate="0" field="height" expression=""/>
-        <default applyOnUpdate="0" field="elevation" expression=""/>
+        <default field="ID" applyOnUpdate="0" expression=""/>
+        <default field="height" applyOnUpdate="0" expression=""/>
+        <default field="elevation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="ID" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="height" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="elevation" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="ID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="height" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="elevation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="ID" exp="" desc=""/>
-        <constraint field="height" exp="" desc=""/>
-        <constraint field="elevation" exp="" desc=""/>
+        <constraint field="ID" desc="" exp=""/>
+        <constraint field="height" desc="" exp=""/>
+        <constraint field="elevation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -6982,18 +6982,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Polygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </wgs84extent>
       <id>complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8</id>
       <datasource>?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews</datasource>
@@ -7057,13 +7057,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7072,7 +7072,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7080,7 +7080,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7148,7 +7148,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7156,7 +7156,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="133,182,111,255" type="QString"/>
@@ -7192,7 +7192,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7200,7 +7200,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -7252,9 +7252,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7262,7 +7262,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="225,89,137,255" type="QString"/>
@@ -7310,7 +7310,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -7349,34 +7349,34 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="page" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns/>
       </attributetableconfig>
       <conditionalstyles>
@@ -7399,7 +7399,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression></previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.41275838185438474</xmin>
         <ymin>-33.90124710387746632</ymin>
@@ -7464,7 +7464,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -7489,13 +7489,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7504,7 +7504,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7512,7 +7512,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7580,7 +7580,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7588,7 +7588,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="190,178,151,255" type="QString"/>
@@ -7624,7 +7624,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7632,7 +7632,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -7684,9 +7684,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7694,7 +7694,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -7766,12 +7766,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="Name" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="Name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -7779,7 +7779,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -7814,7 +7814,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -7824,9 +7824,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="LineGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="LineGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -7846,7 +7846,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -7874,12 +7874,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -7887,7 +7887,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -7956,7 +7956,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -7965,7 +7965,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -7988,30 +7988,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Name"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Name" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Name" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Name" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Name" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="Name" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -8056,7 +8056,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>Name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.40814103070666974</xmin>
         <ymin>-33.90827185075657724</ymin>
@@ -8121,7 +8121,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -8146,13 +8146,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -8161,7 +8161,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8169,7 +8169,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -8237,7 +8237,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8245,7 +8245,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="145,82,45,255" type="QString"/>
@@ -8281,7 +8281,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8289,7 +8289,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -8341,14 +8341,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{cdec7d40-64aa-438c-9c37-b3d2a98670e7}">
-          <rule key="{85adf11b-f941-44b6-8847-c828ab845cdc}" filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" label="21KM"/>
-          <rule key="{78aff69a-52d7-4875-b2ae-48b907117fa1}" filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" label="10KM"/>
-          <rule key="{cf733f0f-ab72-441e-b213-841aa39c1671}" filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" label="5KM"/>
+          <rule filter="&quot;distance&quot; = '21KM'" symbol="0" description="Only show when active in Atlas" label="21KM" key="{85adf11b-f941-44b6-8847-c828ab845cdc}"/>
+          <rule filter="&quot;distance&quot; = '10KM'" symbol="1" description="Only show when active in Atlas" label="10KM" key="{78aff69a-52d7-4875-b2ae-48b907117fa1}"/>
+          <rule filter="&quot;distance&quot; = '5KM'" symbol="2" description="Only show when active in Atlas" label="5KM" key="{cf733f0f-ab72-441e-b213-841aa39c1671}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8356,7 +8356,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8398,7 +8398,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8406,7 +8406,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -8457,7 +8457,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8510,7 +8510,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@0@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8518,7 +8518,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="210,32,39,255" type="QString"/>
@@ -8552,7 +8552,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@0@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@0@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8560,7 +8560,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="210,32,39,255" type="QString"/>
@@ -8597,7 +8597,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -8663,7 +8663,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -8671,7 +8671,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8724,7 +8724,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8732,7 +8732,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8766,7 +8766,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8774,7 +8774,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8811,7 +8811,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -8864,7 +8864,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -8872,7 +8872,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8906,7 +8906,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -8914,7 +8914,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -8951,7 +8951,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -9017,7 +9017,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9025,7 +9025,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -9078,7 +9078,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9086,7 +9086,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9120,7 +9120,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@2@0@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@2@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9128,7 +9128,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9165,7 +9165,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -9218,7 +9218,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -9226,7 +9226,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9260,7 +9260,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@2@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@2@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9268,7 +9268,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="69,100,25,255" type="QString"/>
@@ -9305,7 +9305,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -9390,12 +9390,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -9403,7 +9403,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -9472,7 +9472,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9481,7 +9481,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -9507,30 +9507,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="Distance"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="Distance" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Distance" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="Distance" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="id" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -9593,7 +9593,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.38517016505928936</xmin>
         <ymin>-33.91987011678683217</ymin>
@@ -9666,13 +9666,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -9681,7 +9681,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9689,7 +9689,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -9757,7 +9757,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9765,7 +9765,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -9801,7 +9801,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9809,7 +9809,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -9861,9 +9861,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="0.796078" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.796078" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -9871,7 +9871,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -9933,14 +9933,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{de1ff1b5-a53a-4841-835f-57785b684a9d}">
-          <rule key="{9ea624c1-7179-4746-8777-84b8008475a1}" filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps">
+          <rule filter="'marshal' = attribute( $atlasfeature , 'type' )" description="Show in marshal maps" key="{9ea624c1-7179-4746-8777-84b8008475a1}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="8" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -9948,7 +9948,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -9989,7 +9989,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -10025,9 +10025,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="8" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="1" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="8" geometryGeneratorEnabled="0" placement="1" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10078,7 +10078,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -10092,14 +10092,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}" filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview">
+          <rule filter="'marshal plan' = attribute( $atlasfeature , 'type' )" description="Show in marshal overview" key="{df44d75f-ef99-453d-ab36-57ffc3b9d443}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="4" forcedBold="0" textColor="227,0,185,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="4" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="227,0,185,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -10107,7 +10107,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -10148,7 +10148,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -10169,9 +10169,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1" zIndex="2" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10207,7 +10207,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -10371,12 +10371,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10384,7 +10384,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -10453,7 +10453,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="10" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="10" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10462,7 +10462,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -10501,35 +10501,35 @@ 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 field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="position" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -10605,7 +10605,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Polygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Polygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -10680,13 +10680,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -10695,7 +10695,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10703,7 +10703,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -10771,7 +10771,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10779,7 +10779,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="164,113,88,255" type="QString"/>
@@ -10815,7 +10815,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10823,7 +10823,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -10875,9 +10875,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -10885,7 +10885,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,85,0,255" type="QString"/>
@@ -10939,12 +10939,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -10952,7 +10952,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -11021,7 +11021,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="1" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -11030,7 +11030,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -11087,50 +11087,50 @@ 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 index="5" name="" field="fence_len"/>
+        <alias field="name" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
+        <alias field="cone_len" index="4" name=""/>
+        <alias field="fence_len" index="5" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="group" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="cone_len" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="fence_len" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="name" hidden="0" width="415" type="field"/>
-          <column name="group" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="cone_len" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="fence_len" hidden="0" width="-1" type="field"/>
+          <column width="415" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="cone_len" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="fence_len" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -11187,7 +11187,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"name"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.37673321782479974</xmin>
         <ymin>-33.94582464707783487</ymin>
@@ -11252,7 +11252,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -11266,26 +11266,26 @@ def my_form_open(dialog, layer, feature):
       <layerDependencies/>
       <dataDependencies/>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="cone_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
       </expressionfields>
       <map-layer-style-manager current="Fencing">
         <map-layer-style name="Fencing"/>
         <map-layer-style name="Simple">
-          <qgis simplifyMaxScale="1" hasScaleBasedVisibilityFlag="0" readOnly="0" minScale="1e+08" labelsEnabled="1" simplifyDrawingHints="1" version="3.8.3-Zanzibar" simplifyAlgorithm="0" simplifyDrawingTol="1" styleCategories="AllStyleCategories" maxScale="0" simplifyLocal="1">
+          <qgis simplifyLocal="1" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" simplifyAlgorithm="0" version="3.8.3-Zanzibar" simplifyMaxScale="1" simplifyDrawingTol="1" readOnly="0" minScale="1e+08" maxScale="0" simplifyDrawingHints="1" styleCategories="AllStyleCategories">
             <flags>
               <Identifiable>1</Identifiable>
               <Removable>1</Removable>
               <Searchable>1</Searchable>
             </flags>
-            <renderer-v2 forceraster="0" symbollevels="1" enableorderby="0" type="RuleRenderer">
+            <renderer-v2 symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
               <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-                <rule key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible"/>
+                <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" symbol="0" label="Visible" key="{e0436112-79a6-4e28-b534-11f3e84d2a7e}"/>
               </rules>
               <symbols>
-                <symbol alpha="1" clip_to_extent="1" force_rhr="0" name="0" type="line">
-                  <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+                <symbol force_rhr="0" clip_to_extent="1" name="0" alpha="1" type="line">
+                  <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                     <prop v="square" k="capstyle"/>
                     <prop v="5;2" k="customdash"/>
                     <prop v="3x:0,0,0,0,0,0" k="customdash_map_unit_scale"/>
@@ -11315,17 +11315,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 fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.8" multilineHeight="1" previewBkgrdColor="#ffffff" fieldName="comment" fontSize="11" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" fontFamily="Myriad Pro" fontCapitals="0" isExpression="0" fontSizeUnit="Point">
-                      <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                      <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="0.6" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOpacity="0.6" shapeOffsetX="0" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile=""/>
-                      <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowDraw="0" shadowRadiusAlphaOnly="0"/>
+                    <text-style isExpression="0" fontCapitals="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="11" fontItalic="0" fontUnderline="0" textOpacity="0.8" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
+                      <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                      <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.6" shapeType="0" shapeOpacity="0.6" shapeJoinStyle="128" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" formatNumbers="0" placeDirectionSymbol="0" addDirectionSymbol="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" placementFlags="2" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="5" priority="5" repeatDistance="0" geometryGeneratorType="PointGeometry" xOffset="0" placement="4" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" centroidWhole="0" geometryGenerator="" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering scaleVisibility="0" mergeLines="1" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="1" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
+                    <placement repeatDistanceUnits="MM" placementFlags="2" dist="5" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="4" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11346,17 +11346,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 fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" previewBkgrdColor="#ffffff" fieldName="round( $length, 1) || 'm'" fontSize="12" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" fontFamily="Myriad Pro" fontCapitals="0" isExpression="1" fontSizeUnit="Point">
-                      <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                      <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOpacity="1" shapeOffsetX="0" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeType="0" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile=""/>
-                      <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.7" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowBlendMode="6" shadowDraw="0" shadowRadiusAlphaOnly="0"/>
+                    <text-style isExpression="1" fontCapitals="0" fontFamily="Myriad Pro" fieldName="round( $length, 1) || 'm'" fontWeight="63" blendMode="0" fontLetterSpacing="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="#ffffff" fontSize="12" fontItalic="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1">
+                      <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                      <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeBlendMode="0" shapeSizeType="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeOpacity="1" shapeJoinStyle="64" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM"/>
+                      <shadow shadowOffsetAngle="135" shadowOpacity="0.7" shadowRadiusAlphaOnly="0" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetGlobal="1"/>
                       <substitutions/>
                     </text-style>
-                    <text-format rightDirectionSymbol=">" formatNumbers="0" placeDirectionSymbol="0" addDirectionSymbol="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                    <placement offsetUnits="MM" placementFlags="15" geometryGeneratorEnabled="0" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" dist="1" priority="5" repeatDistance="0" geometryGeneratorType="PointGeometry" xOffset="0" placement="2" centroidInside="0" offsetType="0" quadOffset="4" yOffset="0" centroidWhole="0" geometryGenerator="" repeatDistanceUnits="MM" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" preserveRotation="1" distUnits="MM" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" fitInPolygonOnly="0" distMapUnitScale="3x:0,0,0,0,0,0"/>
-                    <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" fontMaxPixelSize="10000" labelPerPart="0" displayAll="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                    <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" plussign="0" reverseDirectionSymbol="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" multilineAlign="4294967295" autoWrapLength="0"/>
+                    <placement repeatDistanceUnits="MM" placementFlags="15" dist="1" rotationAngle="0" distUnits="MM" geometryGenerator="" offsetType="0" xOffset="0" offsetUnits="MM" preserveRotation="1" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" placement="2" priority="5" repeatDistance="0" centroidWhole="0" quadOffset="4" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" geometryGeneratorEnabled="0" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" geometryGeneratorType="PointGeometry" maxCurvedCharAngleOut="-25" maxCurvedCharAngleIn="25" distMapUnitScale="3x:0,0,0,0,0,0"/>
+                    <rendering maxNumLabels="2000" obstacleFactor="1" displayAll="0" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                     <dd_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -11380,21 +11380,21 @@ def my_form_open(dialog, layer, feature):
               </rules>
             </labeling>
             <customproperties>
-              <property key="dualview/previewExpressions" value="id"/>
-              <property key="embeddedWidgets/count" value="0"/>
+              <property value="id" key="dualview/previewExpressions"/>
+              <property value="0" key="embeddedWidgets/count"/>
               <property key="variableNames"/>
               <property key="variableValues"/>
             </customproperties>
             <blendMode>0</blendMode>
             <featureBlendMode>0</featureBlendMode>
             <layerOpacity>1</layerOpacity>
-            <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-              <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" penColor="#000000" scaleDependency="Area" penAlpha="255" minScaleDenominator="0" backgroundColor="#ffffff" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" height="15" rotationOffset="270">
+            <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+              <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" height="15" minimumSize="0" lineSizeType="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" rotationOffset="270" backgroundColor="#ffffff" diagramOrientation="Up" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
                 <fontProperties style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-                <attribute color="#000000" field="" label=""/>
+                <attribute field="" color="#000000" label=""/>
               </DiagramCategory>
             </SingleCategoryDiagramRenderer>
-            <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" dist="0" priority="0" zIndex="0">
+            <DiagramLayerSettings showAll="1" priority="0" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
               <properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -11403,7 +11403,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </properties>
             </DiagramLayerSettings>
-            <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+            <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
               <activeChecks/>
               <checkConfiguration/>
             </geometryOptions>
@@ -11487,81 +11487,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 field="id" index="0" name=""/>
+              <alias field="group" index="1" name=""/>
+              <alias field="comment" index="2" name=""/>
+              <alias field="moveable" index="3" name=""/>
+              <alias field="type" index="4" name=""/>
+              <alias field="name" index="5" name=""/>
+              <alias field="hidden" index="6" name=""/>
+              <alias field="auxiliary_storage_labeling_positiony" index="7" name=""/>
+              <alias field="auxiliary_storage_labeling_positionx" index="8" name=""/>
+              <alias field="fence_len" index="9" name=""/>
+              <alias field="cone_len" index="10" name=""/>
             </aliases>
             <excludeAttributesWMS/>
             <excludeAttributesWFS/>
             <defaults>
-              <default applyOnUpdate="0" field="id" expression=""/>
-              <default applyOnUpdate="0" field="group" expression=""/>
-              <default applyOnUpdate="0" field="comment" expression=""/>
-              <default applyOnUpdate="0" field="moveable" expression=""/>
-              <default applyOnUpdate="0" field="type" expression=""/>
-              <default applyOnUpdate="0" field="name" expression=""/>
-              <default applyOnUpdate="0" field="hidden" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positiony" expression=""/>
-              <default applyOnUpdate="0" field="auxiliary_storage_labeling_positionx" expression=""/>
-              <default applyOnUpdate="0" field="fence_len" expression=""/>
-              <default applyOnUpdate="0" field="cone_len" expression=""/>
+              <default field="id" applyOnUpdate="0" expression=""/>
+              <default field="group" applyOnUpdate="0" expression=""/>
+              <default field="comment" applyOnUpdate="0" expression=""/>
+              <default field="moveable" applyOnUpdate="0" expression=""/>
+              <default field="type" applyOnUpdate="0" expression=""/>
+              <default field="name" applyOnUpdate="0" expression=""/>
+              <default field="hidden" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positiony" applyOnUpdate="0" expression=""/>
+              <default field="auxiliary_storage_labeling_positionx" applyOnUpdate="0" expression=""/>
+              <default field="fence_len" applyOnUpdate="0" expression=""/>
+              <default field="cone_len" applyOnUpdate="0" expression=""/>
             </defaults>
             <constraints>
-              <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="group" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="comment" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="moveable" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="hidden" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="auxiliary_storage_labeling_positiony" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="auxiliary_storage_labeling_positionx" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="fence_len" notnull_strength="0" unique_strength="0" constraints="0"/>
-              <constraint exp_strength="0" field="cone_len" notnull_strength="0" unique_strength="0" constraints="0"/>
+              <constraint field="id" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="group" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="comment" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="moveable" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="type" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="name" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="hidden" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="auxiliary_storage_labeling_positiony" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="auxiliary_storage_labeling_positionx" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="fence_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
+              <constraint field="cone_len" unique_strength="0" constraints="0" exp_strength="0" notnull_strength="0"/>
             </constraints>
             <constraintExpressions>
-              <constraint field="id" exp="" desc=""/>
-              <constraint field="group" exp="" desc=""/>
-              <constraint field="comment" exp="" desc=""/>
-              <constraint field="moveable" exp="" desc=""/>
-              <constraint field="type" exp="" desc=""/>
-              <constraint field="name" exp="" desc=""/>
-              <constraint field="hidden" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positiony" exp="" desc=""/>
-              <constraint field="auxiliary_storage_labeling_positionx" exp="" desc=""/>
-              <constraint field="fence_len" exp="" desc=""/>
-              <constraint field="cone_len" exp="" desc=""/>
+              <constraint field="id" desc="" exp=""/>
+              <constraint field="group" desc="" exp=""/>
+              <constraint field="comment" desc="" exp=""/>
+              <constraint field="moveable" desc="" exp=""/>
+              <constraint field="type" desc="" exp=""/>
+              <constraint field="name" desc="" exp=""/>
+              <constraint field="hidden" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positiony" desc="" exp=""/>
+              <constraint field="auxiliary_storage_labeling_positionx" desc="" exp=""/>
+              <constraint field="fence_len" desc="" exp=""/>
+              <constraint field="cone_len" desc="" exp=""/>
             </constraintExpressions>
             <expressionfields>
-              <field typeName="double precision" subType="0" name="fence_len" comment="" length="-1" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" precision="0" type="6"/>
-              <field typeName="double precision" subType="0" name="fence_len" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" precision="0" type="6"/>
-              <field typeName="double precision" subType="0" name="cone_len" comment="" length="-1" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" precision="0" type="6"/>
+              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 1)" type="6" precision="0"/>
+              <field typeName="double precision" name="fence_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" type="6" precision="0"/>
+              <field typeName="double precision" name="cone_len" length="-1" subType="0" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length, 0), 0), 1)" type="6" precision="0"/>
             </expressionfields>
             <attributeactions>
-              <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+              <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
             </attributeactions>
-            <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+            <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
               <columns>
-                <column name="id" hidden="0" width="-1" type="field"/>
-                <column name="group" hidden="0" width="-1" type="field"/>
-                <column hidden="1" width="-1" type="actions"/>
-                <column name="comment" hidden="0" width="223" type="field"/>
-                <column name="moveable" hidden="0" width="-1" type="field"/>
-                <column name="type" hidden="0" width="-1" type="field"/>
-                <column name="name" hidden="0" width="414" type="field"/>
-                <column name="hidden" hidden="0" width="-1" type="field"/>
-                <column name="fence_len" hidden="0" width="-1" type="field"/>
-                <column name="cone_len" hidden="0" width="-1" type="field"/>
-                <column name="auxiliary_storage_labeling_positiony" hidden="1" width="-1" type="field"/>
-                <column name="auxiliary_storage_labeling_positionx" hidden="1" width="-1" type="field"/>
+                <column width="-1" hidden="0" name="id" type="field"/>
+                <column width="-1" hidden="0" name="group" type="field"/>
+                <column width="-1" hidden="1" type="actions"/>
+                <column width="223" hidden="0" name="comment" type="field"/>
+                <column width="-1" hidden="0" name="moveable" type="field"/>
+                <column width="-1" hidden="0" name="type" type="field"/>
+                <column width="414" hidden="0" name="name" type="field"/>
+                <column width="-1" hidden="0" name="hidden" type="field"/>
+                <column width="-1" hidden="0" name="fence_len" type="field"/>
+                <column width="-1" hidden="0" name="cone_len" type="field"/>
+                <column width="-1" hidden="1" name="auxiliary_storage_labeling_positiony" type="field"/>
+                <column width="-1" hidden="1" name="auxiliary_storage_labeling_positionx" type="field"/>
               </columns>
             </attributetableconfig>
             <conditionalstyles>
@@ -11634,13 +11634,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -11649,7 +11649,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11657,7 +11657,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -11725,7 +11725,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11733,7 +11733,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="133,182,111,255" type="QString"/>
@@ -11769,7 +11769,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11777,7 +11777,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -11829,19 +11829,19 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="1" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="1" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{1747eeb3-5193-4fd1-bb47-6984c7977e45}">
-          <rule key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps">
-            <rule key="{55e15f58-d121-44dd-9fec-2e77eb26097f}" filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones"/>
-            <rule key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}" filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences"/>
-            <rule key="{070da3c0-926e-4be7-b593-17a3235a88fa}" filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences"/>
-            <rule key="{7be11354-6d79-48d0-a650-aea5f58c1846}" filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction"/>
+          <rule filter="regexp_match(attribute( @atlas_feature , 'type' ), '^(cone|fenc|marshal)') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" label="Show in fencing maps" key="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}">
+            <rule filter="regexp_match(&quot;type&quot;, '^cone') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" label="Cones" key="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="1" label="Moveable fences" key="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^fenc') AND NOT &quot;moveable&quot; IS '1' AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Fixed fences" key="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+            <rule filter="regexp_match(&quot;type&quot;, '^constr') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="3" label="Construction" key="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
           </rule>
-          <rule key="{7917c389-04f8-48d5-ab53-8783abd3803e}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="4" label="Is Visible"/>
-          <rule 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; )" symbol="4" label="Is Visible" key="{7917c389-04f8-48d5-ab53-8783abd3803e}"/>
+          <rule symbol="5" key="{29865286-9e35-459b-929c-beb87e7538de}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11849,7 +11849,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -11921,7 +11921,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -11929,7 +11929,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="round" type="QString"/>
@@ -12001,7 +12001,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12009,7 +12009,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12081,7 +12081,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12089,7 +12089,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12161,7 +12161,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12169,7 +12169,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12235,7 +12235,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="5" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -12243,7 +12243,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -12313,14 +12313,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{c671f96e-2f37-4e60-9867-9a3746a7e824}">
-          <rule key="{cf092438-1d21-40b3-8218-4c8ef416cb6a}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot;" key="{cf092438-1d21-40b3-8218-4c8ef416cb6a}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.80000000000000004" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="comment" fontSize="11" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="comment" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="0.59999999999999998" shapeBorderColor="255,255,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="255,255,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.59999999999999998" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="128" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12328,7 +12328,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -12363,7 +12363,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -12384,9 +12384,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="14" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="5" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="1" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1.8200000000000001" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
+              <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="5" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8200000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12417,7 +12417,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -12431,14 +12431,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{8f0bbb62-12a0-4d1f-856f-8a119d5b6a26}" filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')">
+          <rule filter="attribute( @atlas_feature , 'group' ) = &quot;group&quot; AND regexp_match(&quot;type&quot;, '^(fenc|cone)')" key="{8f0bbb62-12a0-4d1f-856f-8a119d5b6a26}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12446,7 +12446,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -12496,7 +12496,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12504,7 +12504,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -12539,7 +12539,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -12549,9 +12549,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="6" xOffset="0" placementFlags="14" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12587,7 +12587,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -12601,14 +12601,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{b2f2009a-4ab7-4a86-a46e-7b85998f4204}" filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0">
+          <rule filter="is_layer_visible( 'fencing' ) AND &quot;hidden&quot; IS NULL" active="0" key="{b2f2009a-4ab7-4a86-a46e-7b85998f4204}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontSize="11" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="round( $length * 100 * 1000, 1) || 'm'" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="11" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12616,7 +12616,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -12666,7 +12666,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -12674,7 +12674,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -12709,7 +12709,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -12719,9 +12719,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="6" xOffset="0" placementFlags="14" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="6" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="14" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12757,7 +12757,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -12789,12 +12789,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -12802,7 +12802,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -12871,7 +12871,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -12880,7 +12880,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -12959,74 +12959,74 @@ 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 field="id" index="0" name=""/>
+        <alias field="group" index="1" name=""/>
+        <alias field="comment" index="2" name=""/>
+        <alias field="moveable" index="3" name=""/>
+        <alias field="type" index="4" name=""/>
+        <alias field="name" index="5" name=""/>
+        <alias field="hidden" index="6" name=""/>
+        <alias field="day" index="7" name=""/>
+        <alias field="fence_len" index="8" name=""/>
+        <alias field="cone_len" index="9" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="group" expression=""/>
-        <default applyOnUpdate="0" field="comment" expression=""/>
-        <default applyOnUpdate="0" field="moveable" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="hidden" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="fence_len" expression=""/>
-        <default applyOnUpdate="0" field="cone_len" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="group" applyOnUpdate="0" expression=""/>
+        <default field="comment" applyOnUpdate="0" expression=""/>
+        <default field="moveable" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="hidden" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="fence_len" applyOnUpdate="0" expression=""/>
+        <default field="cone_len" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="group" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="comment" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="moveable" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="hidden" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="fence_len" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="cone_len" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="group" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="comment" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="moveable" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="hidden" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="fence_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="cone_len" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="group" exp="" desc=""/>
-        <constraint field="comment" exp="" desc=""/>
-        <constraint field="moveable" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="hidden" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="fence_len" exp="" desc=""/>
-        <constraint field="cone_len" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="group" desc="" exp=""/>
+        <constraint field="comment" desc="" exp=""/>
+        <constraint field="moveable" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="hidden" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="fence_len" desc="" exp=""/>
+        <constraint field="cone_len" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="fence_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" length="-1" precision="0" type="6"/>
-        <field typeName="double precision" subType="0" name="cone_len" comment="" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" length="-1" precision="0" type="6"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (regexp_match(&quot;type&quot;, '^fenc'), $length * 100 * 1000, 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="fence_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^fenc'), $length, 0), 0), 1)" comment="" type="6" precision="0"/>
+        <field typeName="double precision" name="cone_len" length="-1" subType="0" expression="round(if (&quot;hidden&quot; IS NULL, if (regexp_match(&quot;type&quot;, '^cone'), $length * 100 * 1000, 0), 0), 1)" comment="" type="6" precision="0"/>
       </expressionfields>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;group&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;group&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="group" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="comment" hidden="0" width="373" type="field"/>
-          <column name="moveable" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="692" type="field"/>
-          <column name="hidden" hidden="0" width="-1" type="field"/>
-          <column name="fence_len" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="cone_len" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="group" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="373" hidden="0" name="comment" type="field"/>
+          <column width="-1" hidden="0" name="moveable" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="692" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="hidden" type="field"/>
+          <column width="-1" hidden="0" name="fence_len" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="cone_len" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13104,7 +13104,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.39891270000000034</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -13177,13 +13177,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13192,7 +13192,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13200,7 +13200,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13268,7 +13268,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13276,7 +13276,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="164,113,88,255" type="QString"/>
@@ -13312,7 +13312,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13320,7 +13320,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13372,9 +13372,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13382,7 +13382,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13466,12 +13466,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13479,7 +13479,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -13548,7 +13548,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13557,7 +13557,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -13573,25 +13573,25 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
+        <alias field="id" index="0" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -13634,18 +13634,18 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="100000" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </extent>
       <wgs84extent>
         <xmin>18.36924763341120581</xmin>
         <ymin>-33.95871753779982782</ymin>
         <xmax>18.42666503715575743</xmax>
-        <ymax>-33.89693315858618661</ymax>
+        <ymax>-33.89686895033258196</ymax>
       </wgs84extent>
       <id>marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51</id>
       <datasource>./marshal overviews.shp|layername=marshal overviews</datasource>
@@ -13707,13 +13707,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -13722,7 +13722,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13730,7 +13730,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -13798,7 +13798,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13806,7 +13806,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="213,180,60,255" type="QString"/>
@@ -13842,7 +13842,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13850,7 +13850,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -13902,9 +13902,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -13912,7 +13912,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="26,0,201,255" type="QString"/>
@@ -13974,12 +13974,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -13987,7 +13987,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -14056,7 +14056,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14071,7 +14071,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -14117,40 +14117,40 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="page" index="2" name=""/>
+        <alias field="day" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="page" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="page" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="page" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="page" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="page" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="page" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;page&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;page&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="page" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="page" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -14197,7 +14197,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.37523075794307204</xmin>
         <ymin>-33.95575166047164828</ymin>
@@ -14262,7 +14262,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -14273,7 +14273,7 @@ def my_form_open(dialog, layer, feature):
       </resourceMetadata>
       <provider encoding="UTF-8">ogr</provider>
       <vectorjoins>
-        <join memoryCache="0" dynamicForm="0" editable="0" cascadedDelete="0" joinFieldName="position" targetFieldName="position" joinLayerId="marshals_by_position20161003112326575" upsertOnEdit="0" customPrefix="csv_" hasCustomPrefix="1">
+        <join upsertOnEdit="0" joinLayerId="marshals_by_position20161003112326575" editable="0" dynamicForm="0" customPrefix="csv_" targetFieldName="position" memoryCache="0" cascadedDelete="0" joinFieldName="position" hasCustomPrefix="1">
           <joinFieldsSubset>
             <field name="position"/>
             <field name="club"/>
@@ -14300,13 +14300,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="id" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="id" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -14315,7 +14315,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14323,7 +14323,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -14391,7 +14391,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14399,7 +14399,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="114,155,111,255" type="QString"/>
@@ -14435,7 +14435,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14443,7 +14443,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14495,14 +14495,14 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{436a5e05-3485-477a-80b7-cf4d12d6dcec}">
-          <rule key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}" filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" label="Show by day in marshal plan"/>
-          <rule key="{308d81eb-cefa-4627-8afb-3baa8363f863}" filter="'marshal plan' = attribute( @atlas_feature , 'type' )" symbol="1" label="Always show in marshal plan"/>
-          <rule key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="2" label="Show in marshal maps"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" symbol="0" description="Show in marshal overview" label="Show by day in marshal plan" key="{ed21fec1-c2e5-4ce6-8b56-2711cbfc14bf}"/>
+          <rule filter="'marshal plan' = attribute( @atlas_feature , 'type' )" checkstate="0" symbol="1" label="Always show in marshal plan" key="{308d81eb-cefa-4627-8afb-3baa8363f863}"/>
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" checkstate="0" symbol="2" label="Show in marshal maps" key="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="0.8" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14510,7 +14510,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14560,7 +14560,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="0.8" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="0.8" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14568,7 +14568,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14618,7 +14618,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="0.01" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="0.01" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -14626,7 +14626,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="1">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="1">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -14680,14 +14680,14 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="rule-based">
         <rules key="{02580e06-5c28-4087-a4e2-d2705453c9fb}">
-          <rule key="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan') AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{ce06e431-d417-4afe-97fa-8d4bf9e0207e}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14695,7 +14695,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -14745,7 +14745,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14753,7 +14753,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -14794,7 +14794,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14804,9 +14804,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1" zIndex="2" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -14842,7 +14842,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -14856,14 +14856,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}" filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" active="0">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), 'marshal plan')" active="0" description="Always show in marshal overview (attribute &quot;type&quot; is marshal plan in marshal overviews.shp)" key="{cad8c7f8-97e6-4c3e-89c4-6166bfc5203d}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.10000000000000001" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.10000000000000001" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14871,7 +14871,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -14921,7 +14921,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -14929,7 +14929,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -14970,7 +14970,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -14980,9 +14980,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="1" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1" zIndex="2" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="1" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="2" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15018,7 +15018,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15032,14 +15032,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}" filter="'marshal' = attribute( @atlas_feature , 'type' )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" active="0">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' )" active="0" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - disabled due to broken z-index" key="{d218bee5-b5a9-4347-ae20-a3b23b9aa8b5}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.5" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.5" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.5" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.5" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15047,7 +15047,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -15088,7 +15088,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15139,9 +15139,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="8" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1.8" zIndex="5" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15207,7 +15207,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15221,14 +15221,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{91072baf-d72c-4be6-b15f-54994870beac}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid != $id AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show inactive labels below active label" key="{91072baf-d72c-4be6-b15f-54994870beac}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.59999999999999998" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="6" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="6" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.59999999999999998" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15236,7 +15236,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -15286,7 +15286,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15294,7 +15294,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,255" type="QString"/>
@@ -15335,7 +15335,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15345,9 +15345,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="8" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1.8" zIndex="5" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="8" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15413,7 +15413,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15427,14 +15427,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}" filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top">
+          <rule filter="'marshal' = attribute( @atlas_feature , 'type' ) AND @atlas_featureid = $id" description="Show in marshal maps (attribute &quot;type&quot; is marshal in marshal_positions) - Show active layer on top" key="{dbd6b3f9-ec3f-436c-ac51-c7866d412105}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="position" fontSize="8" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="position" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0.40000000000000002" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.90000000000000002" shapeSizeX="0.20000000000000001" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.20000000000000001" shapeOffsetY="0" shapeBlendMode="0" shapeType="3" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0.20000000000000001" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.20000000000000001" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.40000000000000002" shapeType="3" shapeFillColor="255,255,0,255" shapeJoinStyle="64" shapeOpacity="0.90000000000000002" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15442,7 +15442,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -15492,7 +15492,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -15500,7 +15500,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,0,255" type="QString"/>
@@ -15541,7 +15541,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -15551,9 +15551,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="0" obstacleFactor="1.8" zIndex="10" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="0" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15619,7 +15619,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -15650,6 +15650,7 @@ def my_form_open(dialog, layer, feature):
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
             <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
+            <Option value="COALESCE( &quot;id&quot;, '&lt;NULL>' )" type="QString"/>
           </Option>
           <Option name="embeddedWidgets/count" value="0" type="QString"/>
           <Option name="labeling/addDirectionSymbol" value="false" type="QString"/>
@@ -15794,12 +15795,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -15807,7 +15808,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -15876,7 +15877,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -15885,7 +15886,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16010,90 +16011,90 @@ 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="xyposition"/>
-        <alias index="5" name="" field="day"/>
-        <alias index="6" name="" field="csv_position"/>
-        <alias index="7" name="" field="csv_club"/>
-        <alias index="8" name="" field="csv_firstname"/>
-        <alias index="9" name="" field="csv_surname"/>
-        <alias index="10" name="" field="csv_days"/>
-        <alias index="11" name="" field="csv_first_runner"/>
-        <alias index="12" name="" field="csv_last_runner"/>
-        <alias index="13" name="" field="csv_instructions"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="position" index="1" name=""/>
+        <alias field="type" index="2" name=""/>
+        <alias field="notes" index="3" name=""/>
+        <alias field="xyposition" index="4" name=""/>
+        <alias field="day" index="5" name=""/>
+        <alias field="csv_position" index="6" name=""/>
+        <alias field="csv_club" index="7" name=""/>
+        <alias field="csv_firstname" index="8" name=""/>
+        <alias field="csv_surname" index="9" name=""/>
+        <alias field="csv_days" index="10" name=""/>
+        <alias field="csv_first_runner" index="11" name=""/>
+        <alias field="csv_last_runner" index="12" name=""/>
+        <alias field="csv_instructions" index="13" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="notes" expression=""/>
-        <default applyOnUpdate="0" field="xyposition" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="csv_position" expression=""/>
-        <default applyOnUpdate="0" field="csv_club" expression=""/>
-        <default applyOnUpdate="0" field="csv_firstname" expression=""/>
-        <default applyOnUpdate="0" field="csv_surname" expression=""/>
-        <default applyOnUpdate="0" field="csv_days" expression=""/>
-        <default applyOnUpdate="0" field="csv_first_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_last_runner" expression=""/>
-        <default applyOnUpdate="0" field="csv_instructions" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="notes" applyOnUpdate="0" expression=""/>
+        <default field="xyposition" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="csv_position" applyOnUpdate="0" expression=""/>
+        <default field="csv_club" applyOnUpdate="0" expression=""/>
+        <default field="csv_firstname" applyOnUpdate="0" expression=""/>
+        <default field="csv_surname" applyOnUpdate="0" expression=""/>
+        <default field="csv_days" applyOnUpdate="0" expression=""/>
+        <default field="csv_first_runner" applyOnUpdate="0" expression=""/>
+        <default field="csv_last_runner" applyOnUpdate="0" expression=""/>
+        <default field="csv_instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="notes" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="xyposition" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_club" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_firstname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_surname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_days" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_first_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_last_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="csv_instructions" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="notes" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="xyposition" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="csv_instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="notes" exp="" desc=""/>
-        <constraint field="xyposition" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="csv_position" exp="" desc=""/>
-        <constraint field="csv_club" exp="" desc=""/>
-        <constraint field="csv_firstname" exp="" desc=""/>
-        <constraint field="csv_surname" exp="" desc=""/>
-        <constraint field="csv_days" exp="" desc=""/>
-        <constraint field="csv_first_runner" exp="" desc=""/>
-        <constraint field="csv_last_runner" exp="" desc=""/>
-        <constraint field="csv_instructions" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="notes" desc="" exp=""/>
+        <constraint field="xyposition" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="csv_position" desc="" exp=""/>
+        <constraint field="csv_club" desc="" exp=""/>
+        <constraint field="csv_firstname" desc="" exp=""/>
+        <constraint field="csv_surname" desc="" exp=""/>
+        <constraint field="csv_days" desc="" exp=""/>
+        <constraint field="csv_first_runner" desc="" exp=""/>
+        <constraint field="csv_last_runner" desc="" exp=""/>
+        <constraint field="csv_instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;position&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;position&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="position" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="notes" hidden="0" width="-1" type="field"/>
-          <column name="xyposition" hidden="0" width="-1" type="field"/>
-          <column name="csv_club" hidden="0" width="-1" type="field"/>
-          <column name="csv_first_runner" hidden="0" width="-1" type="field"/>
-          <column name="csv_last_runner" hidden="0" width="-1" type="field"/>
-          <column name="csv_firstname" hidden="0" width="-1" type="field"/>
-          <column name="csv_surname" hidden="0" width="-1" type="field"/>
-          <column name="csv_position" hidden="0" width="-1" type="field"/>
-          <column name="csv_days" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="csv_instructions" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="notes" type="field"/>
+          <column width="-1" hidden="0" name="xyposition" type="field"/>
+          <column width="-1" hidden="0" name="csv_club" type="field"/>
+          <column width="-1" hidden="0" name="csv_first_runner" type="field"/>
+          <column width="-1" hidden="0" name="csv_last_runner" type="field"/>
+          <column width="-1" hidden="0" name="csv_firstname" type="field"/>
+          <column width="-1" hidden="0" name="csv_surname" type="field"/>
+          <column width="-1" hidden="0" name="csv_position" type="field"/>
+          <column width="-1" hidden="0" name="csv_days" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="csv_instructions" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16267,7 +16268,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "id", '&lt;NULL>' )</previewExpression>
       <mapTip>name</mapTip>
     </maplayer>
-    <maplayer autoRefreshTime="0" hasScaleBasedVisibilityFlag="0" refreshOnNotifyMessage="" readOnly="0" minScale="1e+08" autoRefreshEnabled="0" refreshOnNotifyEnabled="0" legendPlaceholderImage="" geometry="No geometry" styleCategories="AllStyleCategories" type="vector" wkbType="NoGeometry" maxScale="100000">
+    <maplayer hasScaleBasedVisibilityFlag="0" refreshOnNotifyEnabled="0" autoRefreshEnabled="0" legendPlaceholderImage="" autoRefreshTime="0" geometry="No geometry" type="vector" minScale="1e+08" readOnly="0" maxScale="100000" refreshOnNotifyMessage="" wkbType="NoGeometry" styleCategories="AllStyleCategories">
       <id>marshals_by_position20161003112326575</id>
       <datasource>file:./marshals_by_position.csv?type=csv&amp;geomType=none&amp;subsetIndex=no&amp;watchFile=yes</datasource>
       <keywordList>
@@ -16320,7 +16321,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16333,8 +16334,8 @@ def my_form_open(dialog, layer, feature):
       <vectorjoins/>
       <layerDependencies/>
       <dataDependencies>
-        <layer id="all_routes20170907054841602"/>
         <layer id="marshal_positions20160930121322287"/>
+        <layer id="all_routes20170907054841602"/>
       </dataDependencies>
       <expressionfields/>
       <map-layer-style-manager current="default">
@@ -16348,13 +16349,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16363,7 +16364,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16371,7 +16372,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -16439,7 +16440,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16447,7 +16448,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="243,166,178,255" type="QString"/>
@@ -16483,7 +16484,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16491,7 +16492,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -16554,7 +16555,7 @@ def my_form_open(dialog, layer, feature):
           <Option name="variableValues" type="invalid"/>
         </Option>
       </customproperties>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -16689,94 +16690,94 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="position"/>
-        <alias index="1" name="" field="club"/>
-        <alias index="2" name="" field="firstname"/>
-        <alias index="3" name="" field="surname"/>
-        <alias index="4" name="" field="name"/>
-        <alias index="5" name="" field="phone"/>
-        <alias index="6" name="" field="email"/>
-        <alias index="7" name="" field="captain"/>
-        <alias index="8" name="" field="captain_phone"/>
-        <alias index="9" name="" field="captain_email"/>
-        <alias index="10" name="" field="days"/>
-        <alias index="11" name="" field="races"/>
-        <alias index="12" name="" field="first_runner"/>
-        <alias index="13" name="" field="last_runner"/>
-        <alias index="14" name="" field="instructions"/>
+        <alias field="position" index="0" name=""/>
+        <alias field="club" index="1" name=""/>
+        <alias field="firstname" index="2" name=""/>
+        <alias field="surname" index="3" name=""/>
+        <alias field="name" index="4" name=""/>
+        <alias field="phone" index="5" name=""/>
+        <alias field="email" index="6" name=""/>
+        <alias field="captain" index="7" name=""/>
+        <alias field="captain_phone" index="8" name=""/>
+        <alias field="captain_email" index="9" name=""/>
+        <alias field="days" index="10" name=""/>
+        <alias field="races" index="11" name=""/>
+        <alias field="first_runner" index="12" name=""/>
+        <alias field="last_runner" index="13" name=""/>
+        <alias field="instructions" index="14" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="position" expression=""/>
-        <default applyOnUpdate="0" field="club" expression=""/>
-        <default applyOnUpdate="0" field="firstname" expression=""/>
-        <default applyOnUpdate="0" field="surname" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="phone" expression=""/>
-        <default applyOnUpdate="0" field="email" expression=""/>
-        <default applyOnUpdate="0" field="captain" expression=""/>
-        <default applyOnUpdate="0" field="captain_phone" expression=""/>
-        <default applyOnUpdate="0" field="captain_email" expression=""/>
-        <default applyOnUpdate="0" field="days" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
-        <default applyOnUpdate="0" field="first_runner" expression=""/>
-        <default applyOnUpdate="0" field="last_runner" expression=""/>
-        <default applyOnUpdate="0" field="instructions" expression=""/>
+        <default field="position" applyOnUpdate="0" expression=""/>
+        <default field="club" applyOnUpdate="0" expression=""/>
+        <default field="firstname" applyOnUpdate="0" expression=""/>
+        <default field="surname" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="phone" applyOnUpdate="0" expression=""/>
+        <default field="email" applyOnUpdate="0" expression=""/>
+        <default field="captain" applyOnUpdate="0" expression=""/>
+        <default field="captain_phone" applyOnUpdate="0" expression=""/>
+        <default field="captain_email" applyOnUpdate="0" expression=""/>
+        <default field="days" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="first_runner" applyOnUpdate="0" expression=""/>
+        <default field="last_runner" applyOnUpdate="0" expression=""/>
+        <default field="instructions" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="position" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="club" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="firstname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="surname" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="phone" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="email" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="captain" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="captain_phone" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="captain_email" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="days" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="races" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="first_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="last_runner" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="instructions" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="position" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="club" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="firstname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="surname" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="captain" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="captain_phone" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="captain_email" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="days" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="first_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="last_runner" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="instructions" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="position" exp="" desc=""/>
-        <constraint field="club" exp="" desc=""/>
-        <constraint field="firstname" exp="" desc=""/>
-        <constraint field="surname" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="phone" exp="" desc=""/>
-        <constraint field="email" exp="" desc=""/>
-        <constraint field="captain" exp="" desc=""/>
-        <constraint field="captain_phone" exp="" desc=""/>
-        <constraint field="captain_email" exp="" desc=""/>
-        <constraint field="days" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="first_runner" exp="" desc=""/>
-        <constraint field="last_runner" exp="" desc=""/>
-        <constraint field="instructions" exp="" desc=""/>
+        <constraint field="position" desc="" exp=""/>
+        <constraint field="club" desc="" exp=""/>
+        <constraint field="firstname" desc="" exp=""/>
+        <constraint field="surname" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="phone" desc="" exp=""/>
+        <constraint field="email" desc="" exp=""/>
+        <constraint field="captain" desc="" exp=""/>
+        <constraint field="captain_phone" desc="" exp=""/>
+        <constraint field="captain_email" desc="" exp=""/>
+        <constraint field="days" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="first_runner" desc="" exp=""/>
+        <constraint field="last_runner" desc="" exp=""/>
+        <constraint field="instructions" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="position" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="221" type="field"/>
-          <column name="club" hidden="0" width="-1" type="field"/>
-          <column name="phone" hidden="0" width="-1" type="field"/>
-          <column name="email" hidden="0" width="-1" type="field"/>
-          <column name="captain" hidden="0" width="-1" type="field"/>
-          <column name="races" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="first_runner" hidden="0" width="-1" type="field"/>
-          <column name="last_runner" hidden="0" width="-1" type="field"/>
-          <column name="instructions" hidden="0" width="-1" type="field"/>
-          <column name="firstname" hidden="0" width="-1" type="field"/>
-          <column name="surname" hidden="0" width="-1" type="field"/>
-          <column name="captain_phone" hidden="0" width="-1" type="field"/>
-          <column name="captain_email" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="position" type="field"/>
+          <column width="221" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="club" type="field"/>
+          <column width="-1" hidden="0" name="phone" type="field"/>
+          <column width="-1" hidden="0" name="email" type="field"/>
+          <column width="-1" hidden="0" name="captain" type="field"/>
+          <column width="-1" hidden="0" name="races" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="first_runner" type="field"/>
+          <column width="-1" hidden="0" name="last_runner" type="field"/>
+          <column width="-1" hidden="0" name="instructions" type="field"/>
+          <column width="-1" hidden="0" name="firstname" type="field"/>
+          <column width="-1" hidden="0" name="surname" type="field"/>
+          <column width="-1" hidden="0" name="captain_phone" type="field"/>
+          <column width="-1" hidden="0" name="captain_email" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -16851,7 +16852,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>first_name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.41055689999999956</xmin>
         <ymin>-33.9145735999999971</ymin>
@@ -16916,7 +16917,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -16941,13 +16942,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -16956,7 +16957,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -16964,7 +16965,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17032,7 +17033,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17040,7 +17041,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="141,90,153,255" type="QString"/>
@@ -17076,7 +17077,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17084,7 +17085,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -17136,13 +17137,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" symbol="0" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17150,7 +17151,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17216,7 +17217,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17224,7 +17225,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -17289,7 +17290,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -17331,7 +17332,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17339,7 +17340,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -17373,7 +17374,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -17381,7 +17382,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -17435,12 +17436,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -17448,7 +17449,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -17517,7 +17518,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17526,7 +17527,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -17549,30 +17550,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -17617,7 +17618,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.37896929129519208</xmin>
         <ymin>-33.93500027904928373</ymin>
@@ -17682,7 +17683,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -17707,13 +17708,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -17722,7 +17723,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17730,7 +17731,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -17798,7 +17799,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17806,7 +17807,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="232,113,141,255" type="QString"/>
@@ -17842,7 +17843,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17850,7 +17851,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -17902,15 +17903,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.75" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="name" fontSize="8.5" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8.5" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.75" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1.5" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1.5" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -17918,7 +17919,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -17953,7 +17954,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -17984,9 +17985,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="1" xOffset="0" placementFlags="2" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="0.20000000000000001" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+          <placement priority="1" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="2" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.20000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -18027,7 +18028,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18055,12 +18056,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18068,7 +18069,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -18137,7 +18138,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18146,7 +18147,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -18245,65 +18246,65 @@ 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 field="id" index="0" name=""/>
+        <alias field="osm_id" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="type" index="3" name=""/>
+        <alias field="z_order" index="4" name=""/>
+        <alias field="population" index="5" name=""/>
+        <alias field="label_x" index="6" name=""/>
+        <alias field="label_y" index="7" name=""/>
+        <alias field="label_rota" index="8" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="population" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="population" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="osm_id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="z_order" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="population" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_x" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_y" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_rota" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="population" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="population" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="population" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="osm_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column name="z_order" hidden="0" width="-1" type="field"/>
-          <column name="population" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rota" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="osm_id" type="field"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="0" name="population" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="label_x" type="field"/>
+          <column width="-1" hidden="0" name="label_y" type="field"/>
+          <column width="-1" hidden="0" name="label_rota" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -18362,7 +18363,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>name</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.3437671999999985</xmin>
         <ymin>-34.02801110000000051</ymin>
@@ -18427,7 +18428,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -18452,13 +18453,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18467,7 +18468,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18475,7 +18476,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -18543,7 +18544,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18551,7 +18552,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,158,23,255" type="QString"/>
@@ -18587,7 +18588,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18595,7 +18596,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -18647,15 +18648,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="0.80000000000000004" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontSize="7" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+          <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if( &quot;never_show&quot;, '', &quot;name&quot; )" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="7" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.80000000000000004" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.59999999999999998" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.59999999999999998" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18663,7 +18664,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -18713,7 +18714,7 @@ def my_form_open(dialog, layer, feature):
                   </data_defined_properties>
                 </layer>
               </symbol>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -18721,7 +18722,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -18756,7 +18757,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -18766,9 +18767,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="0" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MapUnit" lineAnchorPercent="0.5" priority="3" xOffset="0" placementFlags="4" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="3" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="LineGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="1" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="0.29999999999999999" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="5" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="0"/>
+          <placement priority="3" geometryGeneratorEnabled="0" placement="3" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="4" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="LineGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MapUnit" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="0.29999999999999999" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="1" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="5" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -18829,7 +18830,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -18867,12 +18868,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Arial,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Arial,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -18880,7 +18881,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -18949,7 +18950,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -18958,7 +18959,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -19088,100 +19089,100 @@ 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 field="osm_id" index="0" name=""/>
+        <alias field="name" index="1" name=""/>
+        <alias field="highway" index="2" name=""/>
+        <alias field="waterway" index="3" name=""/>
+        <alias field="aerialway" index="4" name=""/>
+        <alias field="barrier" index="5" name=""/>
+        <alias field="man_made" index="6" name=""/>
+        <alias field="z_order" index="7" name=""/>
+        <alias field="other_tags" index="8" name=""/>
+        <alias field="never_show" index="9" name=""/>
+        <alias field="label_x" index="10" name=""/>
+        <alias field="label_y" index="11" name=""/>
+        <alias field="label_rota" index="12" name=""/>
+        <alias field="always_sho" index="13" name=""/>
+        <alias field="resident_a" index="14" name=""/>
+        <alias field="auxiliary_storage_labeling_show" index="15" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="osm_id" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="highway" expression=""/>
-        <default applyOnUpdate="0" field="waterway" expression=""/>
-        <default applyOnUpdate="0" field="aerialway" expression=""/>
-        <default applyOnUpdate="0" field="barrier" expression=""/>
-        <default applyOnUpdate="0" field="man_made" expression=""/>
-        <default applyOnUpdate="0" field="z_order" expression=""/>
-        <default applyOnUpdate="0" field="other_tags" expression=""/>
-        <default applyOnUpdate="0" field="never_show" expression=""/>
-        <default applyOnUpdate="0" field="label_x" expression=""/>
-        <default applyOnUpdate="0" field="label_y" expression=""/>
-        <default applyOnUpdate="0" field="label_rota" expression=""/>
-        <default applyOnUpdate="0" field="always_sho" expression=""/>
-        <default applyOnUpdate="0" field="resident_a" expression=""/>
-        <default applyOnUpdate="0" field="auxiliary_storage_labeling_show" expression=""/>
+        <default field="osm_id" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="highway" applyOnUpdate="0" expression=""/>
+        <default field="waterway" applyOnUpdate="0" expression=""/>
+        <default field="aerialway" applyOnUpdate="0" expression=""/>
+        <default field="barrier" applyOnUpdate="0" expression=""/>
+        <default field="man_made" applyOnUpdate="0" expression=""/>
+        <default field="z_order" applyOnUpdate="0" expression=""/>
+        <default field="other_tags" applyOnUpdate="0" expression=""/>
+        <default field="never_show" applyOnUpdate="0" expression=""/>
+        <default field="label_x" applyOnUpdate="0" expression=""/>
+        <default field="label_y" applyOnUpdate="0" expression=""/>
+        <default field="label_rota" applyOnUpdate="0" expression=""/>
+        <default field="always_sho" applyOnUpdate="0" expression=""/>
+        <default field="resident_a" applyOnUpdate="0" expression=""/>
+        <default field="auxiliary_storage_labeling_show" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="osm_id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="highway" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="waterway" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="aerialway" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="barrier" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="man_made" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="z_order" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="other_tags" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="never_show" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_x" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_y" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label_rota" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="always_sho" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="resident_a" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="auxiliary_storage_labeling_show" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="osm_id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="highway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="waterway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="aerialway" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="barrier" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="man_made" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="z_order" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="other_tags" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="never_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_x" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_y" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label_rota" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="always_sho" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="resident_a" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="auxiliary_storage_labeling_show" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="osm_id" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="highway" exp="" desc=""/>
-        <constraint field="waterway" exp="" desc=""/>
-        <constraint field="aerialway" exp="" desc=""/>
-        <constraint field="barrier" exp="" desc=""/>
-        <constraint field="man_made" exp="" desc=""/>
-        <constraint field="z_order" exp="" desc=""/>
-        <constraint field="other_tags" exp="" desc=""/>
-        <constraint field="never_show" exp="" desc=""/>
-        <constraint field="label_x" exp="" desc=""/>
-        <constraint field="label_y" exp="" desc=""/>
-        <constraint field="label_rota" exp="" desc=""/>
-        <constraint field="always_sho" exp="" desc=""/>
-        <constraint field="resident_a" exp="" desc=""/>
-        <constraint field="auxiliary_storage_labeling_show" exp="" desc=""/>
+        <constraint field="osm_id" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="highway" desc="" exp=""/>
+        <constraint field="waterway" desc="" exp=""/>
+        <constraint field="aerialway" desc="" exp=""/>
+        <constraint field="barrier" desc="" exp=""/>
+        <constraint field="man_made" desc="" exp=""/>
+        <constraint field="z_order" desc="" exp=""/>
+        <constraint field="other_tags" desc="" exp=""/>
+        <constraint field="never_show" desc="" exp=""/>
+        <constraint field="label_x" desc="" exp=""/>
+        <constraint field="label_y" desc="" exp=""/>
+        <constraint field="label_rota" desc="" exp=""/>
+        <constraint field="always_sho" desc="" exp=""/>
+        <constraint field="resident_a" desc="" exp=""/>
+        <constraint field="auxiliary_storage_labeling_show" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;osm_id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;osm_id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="osm_id" hidden="0" width="-1" type="field"/>
-          <column name="name" hidden="0" width="160" type="field"/>
-          <column name="z_order" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="highway" hidden="0" width="-1" type="field"/>
-          <column name="waterway" hidden="0" width="-1" type="field"/>
-          <column name="aerialway" hidden="0" width="-1" type="field"/>
-          <column name="barrier" hidden="0" width="-1" type="field"/>
-          <column name="man_made" hidden="0" width="-1" type="field"/>
-          <column name="other_tags" hidden="0" width="142" type="field"/>
-          <column name="never_show" hidden="0" width="-1" type="field"/>
-          <column name="label_x" hidden="0" width="-1" type="field"/>
-          <column name="label_y" hidden="0" width="-1" type="field"/>
-          <column name="label_rota" hidden="0" width="-1" type="field"/>
-          <column name="always_sho" hidden="0" width="-1" type="field"/>
-          <column name="resident_a" hidden="0" width="-1" type="field"/>
-          <column name="auxiliary_storage_labeling_show" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="osm_id" type="field"/>
+          <column width="160" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="z_order" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="highway" type="field"/>
+          <column width="-1" hidden="0" name="waterway" type="field"/>
+          <column width="-1" hidden="0" name="aerialway" type="field"/>
+          <column width="-1" hidden="0" name="barrier" type="field"/>
+          <column width="-1" hidden="0" name="man_made" type="field"/>
+          <column width="142" hidden="0" name="other_tags" type="field"/>
+          <column width="-1" hidden="0" name="never_show" type="field"/>
+          <column width="-1" hidden="0" name="label_x" type="field"/>
+          <column width="-1" hidden="0" name="label_y" type="field"/>
+          <column width="-1" hidden="0" name="label_rota" type="field"/>
+          <column width="-1" hidden="0" name="always_sho" type="field"/>
+          <column width="-1" hidden="0" name="resident_a" type="field"/>
+          <column width="-1" hidden="0" name="auxiliary_storage_labeling_show" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -19350,7 +19351,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="0" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.3984390148267174</xmin>
         <ymin>-33.90832575607554134</ymin>
@@ -19415,7 +19416,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -19440,13 +19441,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -19455,7 +19456,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19463,7 +19464,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -19531,7 +19532,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19539,7 +19540,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="231,113,72,255" type="QString"/>
@@ -19575,7 +19576,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19583,7 +19584,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19635,17 +19636,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{0927a9cd-bbb2-44ea-811b-fdbcb767a09a}">
-          <rule key="{efda7615-994b-459d-a657-ee8185286b0b}" filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0"/>
-          <rule key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}" filter="&quot;type&quot; = 'toilets'" symbol="1"/>
-          <rule key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}" filter="&quot;type&quot; = 'togbag'" symbol="2"/>
-          <rule key="{67af661e-65f1-44a7-9993-d5a668077b33}" filter=" &quot;type&quot; = 'closure'" symbol="3"/>
-          <rule key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}" filter="&quot;type&quot; = 'myciti'" symbol="4"/>
-          <rule key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}" filter="&quot;type&quot; = 'parking'" symbol="5"/>
+          <rule filter="regexp_match( &quot;type&quot;, '(start|finish)')" symbol="0" key="{efda7615-994b-459d-a657-ee8185286b0b}"/>
+          <rule filter="&quot;type&quot; = 'toilets'" symbol="1" key="{98bd58c0-fb3f-467c-aba3-c7ae911ad149}"/>
+          <rule filter="&quot;type&quot; = 'togbag'" symbol="2" key="{0d82fc83-a3cd-4068-9d3a-0fb004f8cfa5}"/>
+          <rule filter=" &quot;type&quot; = 'closure'" symbol="3" key="{67af661e-65f1-44a7-9993-d5a668077b33}"/>
+          <rule filter="&quot;type&quot; = 'myciti'" symbol="4" key="{b99204cf-0adb-4656-90a9-4ae7d773a6f9}"/>
+          <rule filter="&quot;type&quot; = 'parking'" symbol="5" key="{96cc1758-d85e-4ed4-99e8-6e2730d07f11}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19653,7 +19654,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -19709,7 +19710,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19717,7 +19718,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,32,80,255" type="QString"/>
@@ -19771,7 +19772,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19779,7 +19780,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -19843,7 +19844,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19851,7 +19852,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -19905,7 +19906,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -19913,7 +19914,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="0,12,254,255" type="QString"/>
@@ -20117,7 +20118,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="5" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="5" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20125,7 +20126,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SvgMarker" locked="0" pass="0">
+            <layer class="SvgMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="color" value="43,153,41,255" type="QString"/>
@@ -20183,12 +20184,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="name" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="name" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="2" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="0.80000000000000004" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="2" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.69999999999999996" shapeSizeX="1" shapeRadiiX="2" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="1" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.80000000000000004" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="2" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="1" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="2" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="0.69999999999999996" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="2" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20196,7 +20197,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -20231,7 +20232,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20257,9 +20258,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="2" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="3" yOffset="3" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="2" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1.8" zIndex="10" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+          <placement priority="10" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="2" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="3" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="2" dist="3" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1.8" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="10" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -20295,7 +20296,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -20323,12 +20324,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20336,7 +20337,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -20405,7 +20406,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20414,7 +20415,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -20451,40 +20452,40 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="name" index="2" name=""/>
+        <alias field="distance" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="name" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="name" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="distance" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="name" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="name" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;type&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;type&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="name" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="name" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -20533,7 +20534,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.37312291788339991</xmin>
         <ymin>-33.931815589166888</ymin>
@@ -20606,13 +20607,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -20621,7 +20622,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20629,7 +20630,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -20697,7 +20698,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20705,7 +20706,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="152,125,183,255" type="QString"/>
@@ -20741,7 +20742,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20749,7 +20750,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -20801,9 +20802,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -20811,7 +20812,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="LinePatternFill" locked="0" pass="0">
+            <layer class="LinePatternFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="135" type="QString"/>
                 <Option name="clip_mode" value="during_render" type="QString"/>
@@ -20851,7 +20852,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@0@0" frame_rate="10" type="line">
+              <symbol force_rhr="0" is_animated="0" name="@0@0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -20859,7 +20860,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+                <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="align_dash_pattern" value="0" type="QString"/>
                     <Option name="capstyle" value="square" type="QString"/>
@@ -20926,7 +20927,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </layer>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="211,134,33,255" type="QString"/>
@@ -20978,12 +20979,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -20991,7 +20992,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -21060,7 +21061,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="1" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="1" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21069,7 +21070,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -21085,26 +21086,26 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="FID"/>
+        <alias field="FID" index="0" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="FID" expression=""/>
+        <default field="FID" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="FID" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="FID" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="FID" exp="" desc=""/>
+        <constraint field="FID" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="431" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="431" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -21149,7 +21150,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.3752895999999879</xmin>
         <ymin>-33.94589500000000726</ymin>
@@ -21214,7 +21215,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -21239,13 +21240,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -21254,7 +21255,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21262,7 +21263,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21330,7 +21331,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21338,7 +21339,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="190,207,80,255" type="QString"/>
@@ -21374,7 +21375,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21382,7 +21383,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -21434,16 +21435,16 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{57366f52-c504-4c9a-800f-dcbf1d415bf6}">
-          <rule key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}" filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open"/>
-          <rule key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}" filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking"/>
-          <rule key="{141a0163-d939-4e3f-adf2-645a4b477d1a}" filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed"/>
-          <rule key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}" filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way"/>
-          <rule key="{c145ac1f-246c-492e-a3fe-5817271a80c4}" filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures"/>
+          <rule filter="&quot;status&quot; = 'open'" symbol="0" label="Road Open" key="{1a55e945-61ef-4ec7-9d47-aa181d9fba9f}"/>
+          <rule filter="&quot;status&quot; = 'no-parking'" symbol="1" label="No Parking" key="{bb8770a2-ebd2-4359-9d1d-9ebbb7fadbfa}"/>
+          <rule filter="&quot;status&quot; = 'lane-closed'" symbol="2" label="Lane Closed" key="{141a0163-d939-4e3f-adf2-645a4b477d1a}"/>
+          <rule filter="&quot;status&quot; = 'one-way'" symbol="3" label="One-Way" key="{fff6dd36-b1a4-45e3-bfba-e41cc7bef314}"/>
+          <rule filter="&quot;status&quot; = 'closure'" symbol="4" label="Road Closures" key="{c145ac1f-246c-492e-a3fe-5817271a80c4}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21451,7 +21452,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21528,7 +21529,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21536,7 +21537,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -21578,7 +21579,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@0" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21586,7 +21587,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -21638,7 +21639,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="2" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="2" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21646,7 +21647,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21722,7 +21723,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -21770,7 +21771,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@2@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@2@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21778,7 +21779,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -21836,7 +21837,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="3" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="3" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -21844,7 +21845,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -21920,7 +21921,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -21968,7 +21969,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@3@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@3@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -21976,7 +21977,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="cap_style" value="square" type="QString"/>
@@ -22034,7 +22035,7 @@ def my_form_open(dialog, layer, feature):
               </symbol>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="4" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="4" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22042,7 +22043,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -22123,12 +22124,12 @@ def my_form_open(dialog, layer, feature):
       </renderer-v2>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="Regular" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="times" fontSize="9" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="times" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Regular" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="9" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -22136,7 +22137,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -22171,7 +22172,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22181,9 +22182,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="4294967295" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="2" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="4294967295"/>
+          <placement priority="5" geometryGeneratorEnabled="0" placement="2" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -22203,7 +22204,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -22231,12 +22232,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22244,7 +22245,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -22313,7 +22314,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -22322,7 +22323,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -22359,40 +22360,40 @@ 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 field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
+        <alias field="status" index="2" name=""/>
+        <alias field="times" index="3" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
-        <default applyOnUpdate="0" field="status" expression=""/>
-        <default applyOnUpdate="0" field="times" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
+        <default field="status" applyOnUpdate="0" expression=""/>
+        <default field="times" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="status" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="times" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="status" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="times" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
-        <constraint field="status" exp="" desc=""/>
-        <constraint field="times" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
+        <constraint field="status" desc="" exp=""/>
+        <constraint field="times" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;id&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;id&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="type" hidden="0" width="202" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="status" hidden="0" width="-1" type="field"/>
-          <column name="times" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="202" hidden="0" name="type" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="status" type="field"/>
+          <column width="-1" hidden="0" name="times" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -22441,7 +22442,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="100000" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="100000" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.37569522835420344</xmin>
         <ymin>-33.95582126985814853</ymin>
@@ -22506,7 +22507,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -22531,13 +22532,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -22546,7 +22547,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22554,7 +22555,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -22622,7 +22623,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22630,7 +22631,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="225,89,137,255" type="QString"/>
@@ -22666,7 +22667,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -22674,7 +22675,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -22726,17 +22727,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{d63c5432-5520-43ac-b983-fd469230b197}">
-          <rule key="{24a5df7c-cc81-475f-8d69-986aab397721}" filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes">
+          <rule filter="( attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal$)' ) ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Active routes" key="{24a5df7c-cc81-475f-8d69-986aab397721}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22744,7 +22745,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -22794,7 +22795,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22802,7 +22803,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -22848,7 +22849,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -22858,9 +22859,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -22911,7 +22912,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -22925,14 +22926,14 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{bf78850a-9784-4133-a14f-0af30e9c2f70}" filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" description="Show by day" active="0">
+          <rule filter="regexp_match( attribute( @atlas_feature , 'type' ), '^marshal (plan|overview)' ) AND regexp_match( attribute( @atlas_feature , 'day' ), &quot;day&quot; )" active="0" description="Show by day" key="{bf78850a-9784-4133-a14f-0af30e9c2f70}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+              <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="0,0,0,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="0,0,0,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="0,0,0,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="0,0,0,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22940,7 +22941,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -22990,7 +22991,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -22998,7 +22999,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="0,0,0,255" type="QString"/>
@@ -23044,7 +23045,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23054,9 +23055,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+              <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23107,7 +23108,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23121,15 +23122,15 @@ def my_form_open(dialog, layer, feature):
               </callout>
             </settings>
           </rule>
-          <rule key="{e726e3ba-accf-434a-8ffa-dceae4642f95}" filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" description="List for legends" active="0">
-            <rule key="{a640a5b0-35c2-4ff6-9023-5e825ddbe7be}" filter="&quot;Source&quot; = '21KM'" description="21KM" active="0">
+          <rule filter="attribute( $currentfeature , 'Source' ) = attribute( @atlas_feature , 'Source' )  OR regexp_match( attribute( @atlas_feature , 'type' ), '^(marshal plan$|marshal$)' )" active="0" description="List for legends" key="{e726e3ba-accf-434a-8ffa-dceae4642f95}">
+            <rule filter="&quot;Source&quot; = '21KM'" active="0" description="21KM" key="{a640a5b0-35c2-4ff6-9023-5e825ddbe7be}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="210,32,39,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="210,32,39,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="210,32,39,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="210,32,39,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23137,7 +23138,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="210,32,39,255" type="QString"/>
@@ -23172,7 +23173,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23203,9 +23204,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="3" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="3" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23246,7 +23247,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23260,14 +23261,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule key="{aa14f8a1-c725-4fd0-ab45-a85ddb7a4401}" filter="&quot;Source&quot; = '10KM'" description="10KM" active="0">
+            <rule filter="&quot;Source&quot; = '10KM'" active="0" description="10KM" key="{aa14f8a1-c725-4fd0-ab45-a85ddb7a4401}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, NULL, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="103,34,144,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="103,34,144,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="103,34,144,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="103,34,144,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23275,7 +23276,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="103,34,144,255" type="QString"/>
@@ -23310,7 +23311,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23341,9 +23342,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23384,7 +23385,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23398,14 +23399,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule key="{9fb8f756-122b-4772-a202-d4f6e472edf2}" filter="&quot;Source&quot; = '5KM'" description="5KM" active="0">
+            <rule filter="&quot;Source&quot; = '5KM'" active="0" description="5KM" key="{9fb8f756-122b-4772-a202-d4f6e472edf2}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="128" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="128" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23413,7 +23414,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="145,211,55,255" type="QString"/>
@@ -23448,7 +23449,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23479,9 +23480,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23522,7 +23523,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23536,14 +23537,14 @@ def my_form_open(dialog, layer, feature):
                 </callout>
               </settings>
             </rule>
-            <rule key="{5aa6b2d0-7089-489a-9176-ba78eb19ffde}" filter="&quot;Source&quot; = 'Trail'" description="Trail" active="0">
+            <rule filter="&quot;Source&quot; = 'Trail'" active="0" description="Trail" key="{5aa6b2d0-7089-489a-9176-ba78eb19ffde}">
               <settings calloutType="simple">
-                <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontSize="10" forcedBold="0" textColor="255,255,255,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="1" fontSizeUnit="Point">
+                <text-style isExpression="1" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="if ( &quot;Name&quot; = &quot;RouteLen&quot;, Null, &quot;Name&quot; )" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="255,255,255,255" multilineHeight="1" forcedBold="0">
                   <families/>
-                  <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="64"/>
-                  <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                  <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="1" shapeRotation="0" shapeBorderWidth="1" shapeBorderColor="145,211,55,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="1" shapeRadiiX="1" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="145,211,55,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                  <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="64" bufferSizeUnits="MM"/>
+                  <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                  <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="1" shapeRotation="0" shapeBorderColor="145,211,55,255" shapeBorderWidthUnit="MM" shapeRadiiX="1" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="1" shapeType="0" shapeFillColor="145,211,55,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="1" shapeRotationType="0" shapeRadiiUnit="MM">
+                    <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23551,7 +23552,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                      <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="angle" value="0" type="QString"/>
                           <Option name="cap_style" value="square" type="QString"/>
@@ -23601,7 +23602,7 @@ def my_form_open(dialog, layer, feature):
                         </data_defined_properties>
                       </layer>
                     </symbol>
-                    <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                    <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                       <data_defined_properties>
                         <Option type="Map">
                           <Option name="name" value="" type="QString"/>
@@ -23609,7 +23610,7 @@ def my_form_open(dialog, layer, feature):
                           <Option name="type" value="collection" type="QString"/>
                         </Option>
                       </data_defined_properties>
-                      <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                      <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                         <Option type="Map">
                           <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                           <Option name="color" value="0,72,255,255" type="QString"/>
@@ -23644,7 +23645,7 @@ def my_form_open(dialog, layer, feature):
                       </layer>
                     </symbol>
                   </background>
-                  <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                  <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                   <dd_properties>
                     <Option type="Map">
                       <Option name="name" value="" type="QString"/>
@@ -23654,9 +23655,9 @@ def my_form_open(dialog, layer, feature):
                   </dd_properties>
                   <substitutions/>
                 </text-style>
-                <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="0" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-                <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="1" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="10" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="20" overrunDistance="0" overlapHandling="AllowOverlapIfRequired" preserveRotation="1" polygonPlacementFlags="2" dist="2" yOffset="0" maxCurvedCharAngleOut="-20" geometryGeneratorType="PointGeometry" placement="6" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PointGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-                <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="2" zIndex="0" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+                <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="0" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+                <placement priority="10" geometryGeneratorEnabled="0" placement="6" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-20" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="20" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PointGeometry" distUnits="MM" allowDegraded="1" fitInPolygonOnly="0" overlapHandling="AllowOverlapIfRequired" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="2" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+                <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="2" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -23697,7 +23698,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="drawToAllParts" value="false" type="bool"/>
                     <Option name="enabled" value="0" type="QString"/>
                     <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                    <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                    <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                     <Option name="minLength" value="0" type="double"/>
                     <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -23730,12 +23731,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="100000" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Noto Sans,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="100000">
+          <fontProperties underline="0" strikethrough="0" style="" description="Noto Sans,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -23743,7 +23744,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -23812,7 +23813,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -23821,7 +23822,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -23971,95 +23972,95 @@ 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="Distance"/>
-        <alias index="6" name="" field="RouteLen"/>
-        <alias index="7" name="" field="Source"/>
-        <alias index="8" name="" field="Sort"/>
-        <alias index="9" name="" field="day"/>
-        <alias index="10" name="" field="length_km"/>
-        <alias index="11" name="" field="length_m"/>
-        <alias index="12" name="" field="org_fid"/>
-        <alias index="13" name="" field="distance"/>
-        <alias index="14" name="" field="quadrant"/>
+        <alias field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="Distance" index="5" name=""/>
+        <alias field="RouteLen" index="6" name=""/>
+        <alias field="Source" index="7" name=""/>
+        <alias field="Sort" index="8" name=""/>
+        <alias field="day" index="9" name=""/>
+        <alias field="length_km" index="10" name=""/>
+        <alias field="length_m" index="11" name=""/>
+        <alias field="org_fid" index="12" name=""/>
+        <alias field="distance" index="13" name=""/>
+        <alias field="quadrant" index="14" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="Distance" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="Sort" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="quadrant" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="Distance" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="Sort" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="quadrant" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="descriptio" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="timestamp" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="begin" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="end" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Source" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Sort" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_km" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_m" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="org_fid" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="quadrant" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Sort" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="quadrant" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="Distance" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="Sort" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="quadrant" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="Distance" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="Sort" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="quadrant" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;Distance&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;Distance&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="org_fid" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
-          <column name="Name" hidden="0" width="-1" type="field"/>
-          <column name="Source" hidden="0" width="-1" type="field"/>
-          <column name="RouteLen" hidden="0" width="-1" type="field"/>
-          <column name="descriptio" hidden="0" width="-1" type="field"/>
-          <column name="timestamp" hidden="0" width="-1" type="field"/>
-          <column name="begin" hidden="0" width="-1" type="field"/>
-          <column name="end" hidden="0" width="-1" type="field"/>
-          <column name="Distance" hidden="0" width="-1" type="field"/>
-          <column name="length_km" hidden="0" width="-1" type="field"/>
-          <column name="Sort" hidden="0" width="-1" type="field"/>
-          <column name="quadrant" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="length_m" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="org_fid" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="-1" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="Distance" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" name="Sort" type="field"/>
+          <column width="-1" hidden="0" name="quadrant" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24146,7 +24147,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE("Text", '&lt;NULL>')</previewExpression>
       <mapTip>Text</mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.40435736428151614</xmin>
         <ymin>-33.90613600950420903</ymin>
@@ -24219,13 +24220,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -24234,7 +24235,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24242,7 +24243,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24310,7 +24311,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24318,7 +24319,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="229,182,54,255" type="QString"/>
@@ -24354,7 +24355,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24362,7 +24363,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -24414,9 +24415,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="singleSymbol">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="singleSymbol" forceraster="0">
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24424,7 +24425,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="114,155,111,255" type="QString"/>
@@ -24473,7 +24474,7 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks type="StringList">
           <Option value="" type="QString"/>
         </activeChecks>
@@ -24505,35 +24506,35 @@ 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 field="id" index="0" name=""/>
+        <alias field="area" index="1" name=""/>
+        <alias field="rotation" index="2" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="area" expression=""/>
-        <default applyOnUpdate="0" field="rotation" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="area" applyOnUpdate="0" expression=""/>
+        <default field="rotation" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="area" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="rotation" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="area" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="rotation" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="area" exp="" desc=""/>
-        <constraint field="rotation" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="area" desc="" exp=""/>
+        <constraint field="rotation" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;rotation&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;rotation&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="area" hidden="0" width="-1" type="field"/>
-          <column name="rotation" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="area" type="field"/>
+          <column width="-1" hidden="0" name="rotation" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -24556,7 +24557,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>"id"</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="0" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.38475260238231712</xmin>
         <ymin>-33.92228210414224776</ymin>
@@ -24621,7 +24622,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -24646,13 +24647,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -24661,7 +24662,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24669,7 +24670,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -24737,7 +24738,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24745,7 +24746,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="196,60,57,255" type="QString"/>
@@ -24781,7 +24782,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24789,7 +24790,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -24841,12 +24842,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{01115dc1-cc6e-4980-a968-7ef94a3b9df6}">
-          <rule key="{e9652330-031e-4b93-b5b4-4caae12a21f9}" symbol="0" label="All distances" checkstate="0"/>
+          <rule checkstate="0" symbol="0" label="All distances" key="{e9652330-031e-4b93-b5b4-4caae12a21f9}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -24854,7 +24855,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="1" pass="0">
+            <layer class="SimpleMarker" locked="1" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -24938,12 +24939,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Sans Serif,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Sans Serif,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -24951,7 +24952,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -25020,7 +25021,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -25029,7 +25030,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25138,85 +25139,85 @@ 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 field="Name" index="0" name=""/>
+        <alias field="descriptio" index="1" name=""/>
+        <alias field="timestamp" index="2" name=""/>
+        <alias field="begin" index="3" name=""/>
+        <alias field="end" index="4" name=""/>
+        <alias field="RouteLen" index="5" name=""/>
+        <alias field="Source" index="6" name=""/>
+        <alias field="length_m" index="7" name=""/>
+        <alias field="length_km" index="8" name=""/>
+        <alias field="org_fid" index="9" name=""/>
+        <alias field="distance" index="10" name=""/>
+        <alias field="first_runn" index="11" name=""/>
+        <alias field="last_runne" index="12" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="Name" expression=""/>
-        <default applyOnUpdate="0" field="descriptio" expression=""/>
-        <default applyOnUpdate="0" field="timestamp" expression=""/>
-        <default applyOnUpdate="0" field="begin" expression=""/>
-        <default applyOnUpdate="0" field="end" expression=""/>
-        <default applyOnUpdate="0" field="RouteLen" expression=""/>
-        <default applyOnUpdate="0" field="Source" expression=""/>
-        <default applyOnUpdate="0" field="length_m" expression=""/>
-        <default applyOnUpdate="0" field="length_km" expression=""/>
-        <default applyOnUpdate="0" field="org_fid" expression=""/>
-        <default applyOnUpdate="0" field="distance" expression=""/>
-        <default applyOnUpdate="0" field="first_runn" expression=""/>
-        <default applyOnUpdate="0" field="last_runne" expression=""/>
+        <default field="Name" applyOnUpdate="0" expression=""/>
+        <default field="descriptio" applyOnUpdate="0" expression=""/>
+        <default field="timestamp" applyOnUpdate="0" expression=""/>
+        <default field="begin" applyOnUpdate="0" expression=""/>
+        <default field="end" applyOnUpdate="0" expression=""/>
+        <default field="RouteLen" applyOnUpdate="0" expression=""/>
+        <default field="Source" applyOnUpdate="0" expression=""/>
+        <default field="length_m" applyOnUpdate="0" expression=""/>
+        <default field="length_km" applyOnUpdate="0" expression=""/>
+        <default field="org_fid" applyOnUpdate="0" expression=""/>
+        <default field="distance" applyOnUpdate="0" expression=""/>
+        <default field="first_runn" applyOnUpdate="0" expression=""/>
+        <default field="last_runne" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="Name" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="descriptio" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="timestamp" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="begin" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="end" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="RouteLen" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="Source" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_m" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="length_km" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="org_fid" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="distance" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="first_runn" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="last_runne" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="Name" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="descriptio" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="timestamp" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="begin" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="end" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="RouteLen" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="Source" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_m" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="length_km" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="org_fid" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="distance" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="first_runn" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="last_runne" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="Name" exp="" desc=""/>
-        <constraint field="descriptio" exp="" desc=""/>
-        <constraint field="timestamp" exp="" desc=""/>
-        <constraint field="begin" exp="" desc=""/>
-        <constraint field="end" exp="" desc=""/>
-        <constraint field="RouteLen" exp="" desc=""/>
-        <constraint field="Source" exp="" desc=""/>
-        <constraint field="length_m" exp="" desc=""/>
-        <constraint field="length_km" exp="" desc=""/>
-        <constraint field="org_fid" exp="" desc=""/>
-        <constraint field="distance" exp="" desc=""/>
-        <constraint field="first_runn" exp="" desc=""/>
-        <constraint field="last_runne" exp="" desc=""/>
+        <constraint field="Name" desc="" exp=""/>
+        <constraint field="descriptio" desc="" exp=""/>
+        <constraint field="timestamp" desc="" exp=""/>
+        <constraint field="begin" desc="" exp=""/>
+        <constraint field="end" desc="" exp=""/>
+        <constraint field="RouteLen" desc="" exp=""/>
+        <constraint field="Source" desc="" exp=""/>
+        <constraint field="length_m" desc="" exp=""/>
+        <constraint field="length_km" desc="" exp=""/>
+        <constraint field="org_fid" desc="" exp=""/>
+        <constraint field="distance" desc="" exp=""/>
+        <constraint field="first_runn" desc="" exp=""/>
+        <constraint field="last_runne" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;first_runn&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;first_runn&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="begin" hidden="0" width="179" type="field"/>
-          <column name="RouteLen" hidden="0" width="-1" type="field"/>
-          <column name="Source" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="Name" hidden="0" width="-1" type="field"/>
-          <column name="length_m" hidden="0" width="-1" type="field"/>
-          <column name="length_km" hidden="0" width="-1" type="field"/>
-          <column name="org_fid" hidden="0" width="-1" type="field"/>
-          <column name="first_runn" hidden="0" width="-1" type="field"/>
-          <column name="last_runne" hidden="0" width="-1" type="field"/>
-          <column name="descriptio" hidden="0" width="-1" type="field"/>
-          <column name="timestamp" hidden="0" width="-1" type="field"/>
-          <column name="end" hidden="0" width="-1" type="field"/>
-          <column name="distance" hidden="0" width="-1" type="field"/>
+          <column width="179" hidden="0" name="begin" type="field"/>
+          <column width="-1" hidden="0" name="RouteLen" type="field"/>
+          <column width="-1" hidden="0" name="Source" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="Name" type="field"/>
+          <column width="-1" hidden="0" name="length_m" type="field"/>
+          <column width="-1" hidden="0" name="length_km" type="field"/>
+          <column width="-1" hidden="0" name="org_fid" type="field"/>
+          <column width="-1" hidden="0" name="first_runn" type="field"/>
+          <column width="-1" hidden="0" name="last_runne" type="field"/>
+          <column width="-1" hidden="0" name="descriptio" type="field"/>
+          <column width="-1" hidden="0" name="timestamp" type="field"/>
+          <column width="-1" hidden="0" name="end" type="field"/>
+          <column width="-1" hidden="0" name="distance" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -25307,7 +25308,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>COALESCE( "Name", '&lt;NULL>' )</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiLineString" labelsEnabled="0" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Line" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiLineString" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="0" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Line" type="vector">
       <extent>
         <xmin>18.40189262273444371</xmin>
         <ymin>-33.90990359999999981</ymin>
@@ -25380,13 +25381,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -25395,7 +25396,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25403,7 +25404,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -25471,7 +25472,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25479,7 +25480,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="190,178,151,255" type="QString"/>
@@ -25515,7 +25516,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25523,7 +25524,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -25575,13 +25576,13 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="RuleRenderer">
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="RuleRenderer" forceraster="0">
         <rules key="{5bddb61b-4527-4f61-bf00-ae5121d1f9fd}">
-          <rule key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}" filter="&quot;type&quot; IS 'car'" symbol="0" label="Car"/>
-          <rule key="{38d0d10b-40f2-435a-a94a-70682cc70e95}" filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking"/>
+          <rule filter="&quot;type&quot; IS 'car'" symbol="0" label="Car" key="{99e23238-1702-486a-ac7c-4cd1f83ecb12}"/>
+          <rule filter="&quot;type&quot; IS 'walk'" symbol="1" label="Walking" key="{38d0d10b-40f2-435a-a94a-70682cc70e95}"/>
         </rules>
         <symbols>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="0" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="0" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25589,7 +25590,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -25655,7 +25656,7 @@ def my_form_open(dialog, layer, feature):
               </data_defined_properties>
             </layer>
           </symbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="1" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="1" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -25663,7 +25664,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="flat" type="QString"/>
@@ -25728,7 +25729,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </data_defined_properties>
             </layer>
-            <layer enabled="1" class="MarkerLine" locked="0" pass="0">
+            <layer class="MarkerLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="average_angle_length" value="4" type="QString"/>
                 <Option name="average_angle_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
@@ -25770,7 +25771,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@1@1" frame_rate="10" type="marker">
+              <symbol force_rhr="0" is_animated="0" name="@1@1" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -25778,7 +25779,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="FilledMarker" locked="0" pass="0">
+                <layer class="FilledMarker" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="angle" value="0" type="QString"/>
                     <Option name="color" value="103,34,144,255" type="QString"/>
@@ -25812,7 +25813,7 @@ def my_form_open(dialog, layer, feature):
                       <Option name="type" value="collection" type="QString"/>
                     </Option>
                   </data_defined_properties>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="@@1@1@0" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="@@1@1@0" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -25820,7 +25821,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="103,34,144,255" type="QString"/>
@@ -25874,12 +25875,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -25887,7 +25888,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -25956,7 +25957,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="2" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="2" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -25965,7 +25966,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -25988,30 +25989,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="type"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="type" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="type" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="type" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="type" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="type" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="type" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="type" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="type" hidden="0" width="-1" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="type" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26056,7 +26057,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="Point" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="0" maxScale="0" autoRefreshEnabled="0" geometry="Point" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="Point" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="0" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Point" type="vector">
       <extent>
         <xmin>18.4043294703937228</xmin>
         <ymin>-33.90631712958812471</ymin>
@@ -26129,13 +26130,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -26144,7 +26145,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26152,7 +26153,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -26220,7 +26221,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26228,7 +26229,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="145,82,45,255" type="QString"/>
@@ -26264,7 +26265,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26272,7 +26273,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -26324,15 +26325,15 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="simple">
         <settings calloutType="simple">
-          <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="Semibold" useSubstitutions="0" textOpacity="1" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="label" fontSize="15" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+          <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Semibold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="15" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="1" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="1" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -26340,7 +26341,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -26375,7 +26376,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26385,9 +26386,9 @@ def my_form_open(dialog, layer, feature):
             </dd_properties>
             <substitutions/>
           </text-style>
-          <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="3" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-          <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="0" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MM" lineAnchorClipping="0" quadOffset="4" lineAnchorType="0" centroidWhole="0" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="UnknownGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-          <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="2000" obstacle="1" obstacleFactor="1" zIndex="0" fontLimitPixelSize="0" scaleMin="0" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="0" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+          <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="3"/>
+          <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="0" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="0" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MM" lineAnchorType="0" layerType="UnknownGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="4" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+          <rendering maxNumLabels="2000" unplacedVisibility="0" obstacleFactor="1" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="0" scaleMax="0" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="0" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -26407,7 +26408,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="drawToAllParts" value="false" type="bool"/>
               <Option name="enabled" value="0" type="QString"/>
               <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-              <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+              <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
               <Option name="minLength" value="0" type="double"/>
               <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -26434,12 +26435,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="0" bold="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" strikethrough="0" italic="1" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="0" description="Roboto Condensed,-1,12,255,5,1,0,0,0,0,0" italic="1" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -26447,7 +26448,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -26516,7 +26517,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="18" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="18" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -26525,7 +26526,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration/>
       </geometryOptions>
@@ -26548,30 +26549,30 @@ def my_form_open(dialog, layer, feature):
         </field>
       </fieldConfiguration>
       <aliases>
-        <alias index="0" name="" field="id"/>
-        <alias index="1" name="" field="label"/>
+        <alias field="id" index="0" name=""/>
+        <alias field="label" index="1" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="" sortOrder="0">
+      <attributetableconfig sortExpression="" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -26616,7 +26617,7 @@ def my_form_open(dialog, layer, feature):
       <previewExpression>id</previewExpression>
       <mapTip></mapTip>
     </maplayer>
-    <maplayer simplifyAlgorithm="0" type="vector" legendPlaceholderImage="" symbologyReferenceScale="-1" readOnly="0" autoRefreshTime="0" simplifyDrawingTol="1" simplifyLocal="1" wkbType="MultiPolygon" labelsEnabled="1" refreshOnNotifyMessage="" styleCategories="AllStyleCategories" minScale="100000000" simplifyDrawingHints="1" maxScale="0" autoRefreshEnabled="0" geometry="Polygon" refreshOnNotifyEnabled="0" hasScaleBasedVisibilityFlag="0" simplifyMaxScale="1">
+    <maplayer autoRefreshTime="0" refreshOnNotifyMessage="" simplifyDrawingTol="1" refreshOnNotifyEnabled="0" wkbType="MultiPolygon" simplifyAlgorithm="0" simplifyLocal="1" legendPlaceholderImage="" hasScaleBasedVisibilityFlag="0" labelsEnabled="1" maxScale="0" symbologyReferenceScale="-1" autoRefreshEnabled="0" simplifyMaxScale="1" simplifyDrawingHints="1" readOnly="0" styleCategories="AllStyleCategories" minScale="100000000" geometry="Polygon" type="vector">
       <extent>
         <xmin>18.37549461152003971</xmin>
         <ymin>-33.94162201868364548</ymin>
@@ -26681,7 +26682,7 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <extent>
-          <spatial minx="0" miny="0" dimensions="2" maxz="0" maxx="0" crs="" maxy="0" minz="0"/>
+          <spatial crs="" dimensions="2" maxx="0" minz="0" minx="0" miny="0" maxy="0" maxz="0"/>
           <temporal>
             <period>
               <start></start>
@@ -26706,13 +26707,13 @@ def my_form_open(dialog, layer, feature):
         <Searchable>1</Searchable>
         <Private>0</Private>
       </flags>
-      <temporal enabled="0" mode="0" endField="" limitMode="0" durationField="" accumulate="0" endExpression="" durationUnit="min" startField="" startExpression="" fixedDuration="0">
+      <temporal fixedDuration="0" endField="" mode="0" accumulate="0" durationField="" startExpression="" durationUnit="min" enabled="0" startField="" limitMode="0" endExpression="">
         <fixedRange>
           <start></start>
           <end></end>
         </fixedRange>
       </temporal>
-      <elevation extrusion="0" clamping="Terrain" zoffset="0" extrusionEnabled="0" respectLayerSymbol="1" showMarkerSymbolInSurfacePlots="0" zscale="1" symbology="Line" type="IndividualFeatures" binding="Centroid">
+      <elevation clamping="Terrain" showMarkerSymbolInSurfacePlots="0" binding="Centroid" symbology="Line" respectLayerSymbol="1" extrusionEnabled="0" type="IndividualFeatures" zscale="1" extrusion="0" zoffset="0">
         <data-defined-properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -26721,7 +26722,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </data-defined-properties>
         <profileLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26729,7 +26730,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -26797,7 +26798,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileLineSymbol>
         <profileFillSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26805,7 +26806,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="125,139,143,255" type="QString"/>
@@ -26841,7 +26842,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileFillSymbol>
         <profileMarkerSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -26849,7 +26850,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+            <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="angle" value="0" type="QString"/>
                 <Option name="cap_style" value="square" type="QString"/>
@@ -26901,17 +26902,17 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </profileMarkerSymbol>
       </elevation>
-      <renderer-v2 referencescale="-1" forceraster="0" symbollevels="0" enableorderby="0" type="nullSymbol"/>
+      <renderer-v2 referencescale="-1" symbollevels="0" enableorderby="0" type="nullSymbol" forceraster="0"/>
       <labeling type="rule-based">
         <rules key="{2bf934b8-ceac-4cd9-9cf0-74088d13e156}">
-          <rule key="{c438992b-4486-4e7d-a594-2c46fe177154}" filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables">
+          <rule filter="CASE&#xa;WHEN attribute( @atlas_feature , 'Source' ) IS NULL THEN 1&#xa;WHEN regexp_match( &quot;races&quot;, attribute( @atlas_feature , 'Source' ) ) THEN 1&#xa;ELSE 0&#xa;END" description="Show water tables" key="{c438992b-4486-4e7d-a594-2c46fe177154}">
             <settings calloutType="simple">
-              <text-style fontWordSpacing="0" fontWeight="75" fontUnderline="0" fontStrikeout="0" namedStyle="Bold" useSubstitutions="0" textOpacity="0.90000000000000002" multilineHeight="1" legendString="Aa" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fieldName="label" fontSize="8" forcedBold="0" textColor="31,120,180,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" isExpression="0" fontSizeUnit="Point">
+              <text-style isExpression="0" fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fieldName="label" fontWeight="75" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="Bold" fontSizeMapUnitScale="3x:0,0,0,0,0,0" useSubstitutions="0" previewBkgrdColor="255,255,255,255" fontSize="8" forcedItalic="0" legendString="Aa" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="0.90000000000000002" fontWordSpacing="0" textColor="31,120,180,255" multilineHeight="1" forcedBold="0">
                 <families/>
-                <text-buffer bufferSize="0.75" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="0.40000000000000002" bufferBlendMode="0" bufferNoFill="0" bufferJoinStyle="128"/>
-                <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-                <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0.5" shapeRotation="0" shapeBorderWidth="0.75" shapeBorderColor="31,120,206,255" shapeSizeUnit="MM" shapeDraw="1" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="0.59999999999999998" shapeSizeX="0.75" shapeRadiiX="0.5" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0.29999999999999999" shapeOffsetY="-0.14999999999999999" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,204" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="markerSymbol" frame_rate="10" type="marker">
+                <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="0.40000000000000002" bufferNoFill="0" bufferColor="255,255,255,255" bufferSize="0.75" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+                <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+                <background shapeOffsetY="-0.14999999999999999" shapeSizeY="0.29999999999999999" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0.75" shapeRotation="0" shapeBorderColor="31,120,206,255" shapeBorderWidthUnit="MM" shapeRadiiX="0.5" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0.75" shapeType="0" shapeFillColor="255,255,255,204" shapeJoinStyle="64" shapeOpacity="0.59999999999999998" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="1" shapeOffsetUnit="MM" shapeRadiiY="0.5" shapeRotationType="0" shapeRadiiUnit="MM">
+                  <symbol force_rhr="0" is_animated="0" name="markerSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -26919,7 +26920,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+                    <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="angle" value="0" type="QString"/>
                         <Option name="cap_style" value="square" type="QString"/>
@@ -26969,7 +26970,7 @@ def my_form_open(dialog, layer, feature):
                       </data_defined_properties>
                     </layer>
                   </symbol>
-                  <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+                  <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                     <data_defined_properties>
                       <Option type="Map">
                         <Option name="name" value="" type="QString"/>
@@ -26977,7 +26978,7 @@ def my_form_open(dialog, layer, feature):
                         <Option name="type" value="collection" type="QString"/>
                       </Option>
                     </data_defined_properties>
-                    <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                    <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                       <Option type="Map">
                         <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                         <Option name="color" value="255,255,255,204" type="QString"/>
@@ -27012,7 +27013,7 @@ def my_form_open(dialog, layer, feature):
                     </layer>
                   </symbol>
                 </background>
-                <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+                <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
                 <dd_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -27022,9 +27023,9 @@ def my_form_open(dialog, layer, feature):
                 </dd_properties>
                 <substitutions/>
               </text-style>
-              <text-format rightDirectionSymbol=">" addDirectionSymbol="0" placeDirectionSymbol="0" formatNumbers="0" wrapChar="" multilineAlign="1" plussign="0" autoWrapLength="0" decimals="3" reverseDirectionSymbol="0" leftDirectionSymbol="&lt;" useMaxLineLengthForAutoWrap="1"/>
-              <placement centroidInside="0" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" lineAnchorTextPoint="CenterOfText" allowDegraded="0" geometryGenerator="" repeatDistanceUnits="MM" lineAnchorPercent="0.5" priority="5" xOffset="1" placementFlags="10" rotationUnit="AngleDegrees" maxCurvedCharAngleIn="25" overrunDistance="0" overlapHandling="PreventOverlap" preserveRotation="1" polygonPlacementFlags="2" dist="0" yOffset="0" maxCurvedCharAngleOut="-25" geometryGeneratorType="PointGeometry" placement="0" rotationAngle="0" fitInPolygonOnly="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR" geometryGeneratorEnabled="0" repeatDistance="0" distUnits="MM" offsetUnits="MapUnit" lineAnchorClipping="0" quadOffset="1" lineAnchorType="0" centroidWhole="1" distMapUnitScale="3x:0,0,0,0,0,0" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" offsetType="0" overrunDistanceUnit="MM" layerType="PolygonGeometry" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0"/>
-              <rendering scaleVisibility="0" mergeLines="0" obstacleType="0" drawLabels="1" maxNumLabels="6" obstacle="1" obstacleFactor="0.76000000000000001" zIndex="5" fontLimitPixelSize="0" scaleMin="1" limitNumLabels="0" unplacedVisibility="0" fontMaxPixelSize="10000" labelPerPart="0" scaleMax="10000000" minFeatureSize="0" fontMinPixelSize="3" upsidedownLabels="0"/>
+              <text-format addDirectionSymbol="0" useMaxLineLengthForAutoWrap="1" reverseDirectionSymbol="0" plussign="0" rightDirectionSymbol=">" decimals="3" wrapChar="" placeDirectionSymbol="0" formatNumbers="0" leftDirectionSymbol="&lt;" autoWrapLength="0" multilineAlign="1"/>
+              <placement priority="5" geometryGeneratorEnabled="0" placement="0" repeatDistance="0" rotationUnit="AngleDegrees" centroidWhole="1" polygonPlacementFlags="2" overrunDistanceUnit="MM" lineAnchorClipping="0" placementFlags="10" distMapUnitScale="3x:0,0,0,0,0,0" maxCurvedCharAngleOut="-25" lineAnchorPercent="0.5" xOffset="1" geometryGenerator="" lineAnchorTextPoint="CenterOfText" geometryGeneratorType="PointGeometry" maxCurvedCharAngleIn="25" labelOffsetMapUnitScale="3x:0,0,0,0,0,0" yOffset="0" offsetUnits="MapUnit" lineAnchorType="0" layerType="PolygonGeometry" distUnits="MM" allowDegraded="0" fitInPolygonOnly="0" overlapHandling="PreventOverlap" overrunDistanceMapUnitScale="3x:0,0,0,0,0,0" overrunDistance="0" preserveRotation="1" centroidInside="0" repeatDistanceMapUnitScale="3x:0,0,0,0,0,0" repeatDistanceUnits="MM" offsetType="0" quadOffset="1" dist="0" rotationAngle="0" predefinedPositionOrder="TR,TL,BR,BL,R,L,TSR,BSR"/>
+              <rendering maxNumLabels="6" unplacedVisibility="0" obstacleFactor="0.76000000000000001" limitNumLabels="0" obstacleType="0" obstacle="1" mergeLines="0" fontMaxPixelSize="10000" zIndex="5" scaleMax="10000000" labelPerPart="0" upsidedownLabels="0" minFeatureSize="0" scaleVisibility="0" scaleMin="1" drawLabels="1" fontLimitPixelSize="0" fontMinPixelSize="3"/>
               <dd_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27044,7 +27045,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="drawToAllParts" value="false" type="bool"/>
                   <Option name="enabled" value="0" type="QString"/>
                   <Option name="labelAnchorPoint" value="point_on_exterior" type="QString"/>
-                  <Option name="lineSymbol" value="&lt;symbol is_animated=&quot;0&quot; alpha=&quot;1&quot; clip_to_extent=&quot;1&quot; force_rhr=&quot;0&quot; name=&quot;symbol&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer enabled=&quot;1&quot; class=&quot;SimpleLine&quot; locked=&quot;0&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
+                  <Option name="lineSymbol" value="&lt;symbol force_rhr=&quot;0&quot; is_animated=&quot;0&quot; name=&quot;symbol&quot; clip_to_extent=&quot;1&quot; alpha=&quot;1&quot; frame_rate=&quot;10&quot; type=&quot;line&quot;>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;layer class=&quot;SimpleLine&quot; locked=&quot;0&quot; enabled=&quot;1&quot; pass=&quot;0&quot;>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;align_dash_pattern&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;capstyle&quot; value=&quot;square&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash&quot; value=&quot;5;2&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;customdash_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;dash_pattern_offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;draw_inside_polygon&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;joinstyle&quot; value=&quot;bevel&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_color&quot; value=&quot;60,60,60,255&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_style&quot; value=&quot;solid&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width&quot; value=&quot;0.3&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;line_width_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;offset_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;ring_filter&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_end_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;trim_distance_start_unit&quot; value=&quot;MM&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;tweak_dash_pattern_on_corners&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;use_custom_dash&quot; value=&quot;0&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;width_map_unit_scale&quot; value=&quot;3x:0,0,0,0,0,0&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;prop v=&quot;0&quot; k=&quot;align_dash_pattern&quot;/>&lt;prop v=&quot;square&quot; k=&quot;capstyle&quot;/>&lt;prop v=&quot;5;2&quot; k=&quot;customdash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;customdash_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;customdash_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;dash_pattern_offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;dash_pattern_offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;dash_pattern_offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;draw_inside_polygon&quot;/>&lt;prop v=&quot;bevel&quot; k=&quot;joinstyle&quot;/>&lt;prop v=&quot;60,60,60,255&quot; k=&quot;line_color&quot;/>&lt;prop v=&quot;solid&quot; k=&quot;line_style&quot;/>&lt;prop v=&quot;0.3&quot; k=&quot;line_width&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;line_width_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;offset&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;offset_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;offset_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;ring_filter&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_end&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_end_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_end_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;trim_distance_start&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;trim_distance_start_map_unit_scale&quot;/>&lt;prop v=&quot;MM&quot; k=&quot;trim_distance_start_unit&quot;/>&lt;prop v=&quot;0&quot; k=&quot;tweak_dash_pattern_on_corners&quot;/>&lt;prop v=&quot;0&quot; k=&quot;use_custom_dash&quot;/>&lt;prop v=&quot;3x:0,0,0,0,0,0&quot; k=&quot;width_map_unit_scale&quot;/>&lt;data_defined_properties>&lt;Option type=&quot;Map&quot;>&lt;Option name=&quot;name&quot; value=&quot;&quot; type=&quot;QString&quot;/>&lt;Option name=&quot;properties&quot;/>&lt;Option name=&quot;type&quot; value=&quot;collection&quot; type=&quot;QString&quot;/>&lt;/Option>&lt;/data_defined_properties>&lt;/layer>&lt;/symbol>" type="QString"/>
                   <Option name="minLength" value="0" type="double"/>
                   <Option name="minLengthMapUnitScale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="minLengthUnit" value="MM" type="QString"/>
@@ -27080,12 +27081,12 @@ def my_form_open(dialog, layer, feature):
       <blendMode>0</blendMode>
       <featureBlendMode>0</featureBlendMode>
       <layerOpacity>1</layerOpacity>
-      <SingleCategoryDiagramRenderer attributeLegend="1" diagramType="Histogram">
-        <DiagramCategory lineSizeScale="3x:0,0,0,0,0,0" opacity="1" width="15" spacingUnitScale="3x:0,0,0,0,0,0" penColor="#000000" scaleDependency="Area" penAlpha="255" backgroundColor="#ffffff" minScaleDenominator="0" minimumSize="0" backgroundAlpha="255" labelPlacementMethod="XHeight" diagramOrientation="Up" maxScaleDenominator="1e+08" penWidth="0" scaleBasedVisibility="0" enabled="0" lineSizeType="MM" showAxis="0" barWidth="5" sizeScale="3x:0,0,0,0,0,0" sizeType="MM" direction="1" height="15" rotationOffset="270" spacing="0" spacingUnit="MM">
-          <fontProperties style="" bold="0" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
-          <attribute color="#000000" field="" label="" colorOpacity="1"/>
+      <SingleCategoryDiagramRenderer diagramType="Histogram" attributeLegend="1">
+        <DiagramCategory maxScaleDenominator="1e+08" scaleDependency="Area" enabled="0" width="15" spacing="0" height="15" minimumSize="0" lineSizeType="MM" spacingUnit="MM" penWidth="0" scaleBasedVisibility="0" opacity="1" sizeScale="3x:0,0,0,0,0,0" lineSizeScale="3x:0,0,0,0,0,0" sizeType="MM" backgroundAlpha="255" penAlpha="255" barWidth="5" spacingUnitScale="3x:0,0,0,0,0,0" rotationOffset="270" showAxis="0" backgroundColor="#ffffff" diagramOrientation="Up" direction="1" penColor="#000000" labelPlacementMethod="XHeight" minScaleDenominator="0">
+          <fontProperties underline="0" strikethrough="0" style="" description="Roboto Condensed,11,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
+          <attribute field="" color="#000000" colorOpacity="1" label=""/>
           <axisSymbol>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -27093,7 +27094,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -27162,7 +27163,7 @@ def my_form_open(dialog, layer, feature):
           </axisSymbol>
         </DiagramCategory>
       </SingleCategoryDiagramRenderer>
-      <DiagramLayerSettings showAll="1" obstacle="0" placement="0" linePlacementFlags="2" priority="0" dist="0" zIndex="0">
+      <DiagramLayerSettings priority="0" showAll="1" obstacle="0" zIndex="0" placement="0" linePlacementFlags="2" dist="0">
         <properties>
           <Option type="Map">
             <Option name="name" value="" type="QString"/>
@@ -27171,7 +27172,7 @@ def my_form_open(dialog, layer, feature):
           </Option>
         </properties>
       </DiagramLayerSettings>
-      <geometryOptions geometryPrecision="0" removeDuplicateNodes="0">
+      <geometryOptions removeDuplicateNodes="0" geometryPrecision="0">
         <activeChecks/>
         <checkConfiguration type="Map">
           <Option name="QgsGeometryGapCheck" type="Map">
@@ -27230,45 +27231,45 @@ 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 field="id" index="0" name=""/>
+        <alias field="table_set" index="1" name=""/>
+        <alias field="label" index="2" name=""/>
+        <alias field="races" index="3" name=""/>
+        <alias field="day" index="4" name=""/>
       </aliases>
       <defaults>
-        <default applyOnUpdate="0" field="id" expression=""/>
-        <default applyOnUpdate="0" field="table_set" expression=""/>
-        <default applyOnUpdate="0" field="label" expression=""/>
-        <default applyOnUpdate="0" field="races" expression=""/>
-        <default applyOnUpdate="0" field="day" expression=""/>
+        <default field="id" applyOnUpdate="0" expression=""/>
+        <default field="table_set" applyOnUpdate="0" expression=""/>
+        <default field="label" applyOnUpdate="0" expression=""/>
+        <default field="races" applyOnUpdate="0" expression=""/>
+        <default field="day" applyOnUpdate="0" expression=""/>
       </defaults>
       <constraints>
-        <constraint exp_strength="0" field="id" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="table_set" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="label" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="races" notnull_strength="0" unique_strength="0" constraints="0"/>
-        <constraint exp_strength="0" field="day" notnull_strength="0" unique_strength="0" constraints="0"/>
+        <constraint field="id" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="table_set" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="label" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="races" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
+        <constraint field="day" constraints="0" unique_strength="0" exp_strength="0" notnull_strength="0"/>
       </constraints>
       <constraintExpressions>
-        <constraint field="id" exp="" desc=""/>
-        <constraint field="table_set" exp="" desc=""/>
-        <constraint field="label" exp="" desc=""/>
-        <constraint field="races" exp="" desc=""/>
-        <constraint field="day" exp="" desc=""/>
+        <constraint field="id" desc="" exp=""/>
+        <constraint field="table_set" desc="" exp=""/>
+        <constraint field="label" desc="" exp=""/>
+        <constraint field="races" desc="" exp=""/>
+        <constraint field="day" desc="" exp=""/>
       </constraintExpressions>
       <expressionfields/>
       <attributeactions>
-        <defaultAction key="Canvas" value="{00000000-0000-0000-0000-000000000000}"/>
+        <defaultAction value="{00000000-0000-0000-0000-000000000000}" key="Canvas"/>
       </attributeactions>
-      <attributetableconfig actionWidgetStyle="dropDown" sortExpression="&quot;table_set&quot;" sortOrder="0">
+      <attributetableconfig sortExpression="&quot;table_set&quot;" actionWidgetStyle="dropDown" sortOrder="0">
         <columns>
-          <column name="id" hidden="0" width="-1" type="field"/>
-          <column hidden="1" width="-1" type="actions"/>
-          <column name="table_set" hidden="0" width="-1" type="field"/>
-          <column name="label" hidden="0" width="-1" type="field"/>
-          <column name="day" hidden="0" width="-1" type="field"/>
-          <column name="races" hidden="0" width="130" type="field"/>
+          <column width="-1" hidden="0" name="id" type="field"/>
+          <column width="-1" hidden="1" type="actions"/>
+          <column width="-1" hidden="0" name="table_set" type="field"/>
+          <column width="-1" hidden="0" name="label" type="field"/>
+          <column width="-1" hidden="0" name="day" type="field"/>
+          <column width="130" hidden="0" name="races" type="field"/>
         </columns>
       </attributetableconfig>
       <conditionalstyles>
@@ -27520,7 +27521,7 @@ def my_form_open(dialog, layer, feature):
       <disabledLayers type="QStringList"/>
     </Identify>
     <Layouts>
-      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan</lastLayoutExportDir>
+      <lastLayoutExportDir type="QString">/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/Marshal plan/Gun Run 2022 - Marshal Plan rev 4.1.pdf</lastLayoutExportDir>
     </Layouts>
     <Legend>
       <filterByMap type="bool">false</filterByMap>
@@ -27688,292 +27689,292 @@ def my_form_open(dialog, layer, feature):
     </Option>
   </dataDefinedServerProperties>
   <visibility-presets>
-    <visibility-preset name="Access Routes" has-expanded-info="1">
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+    <visibility-preset has-expanded-info="1" name="Access Routes">
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1"/>
+      <layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Elevation"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Ask Me" has-expanded-info="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="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
-      <layer style="default" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Ask Me">
+      <layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4"/>
-      <layer 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"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Ask Me"/>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Ask Me"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Fencing" has-checked-group-info="1" has-expanded-info="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 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="0"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="water_tables20170921142016467" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Fencing">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer 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="OSM data"/>
-        <checked-group-node id="Fencing and Cones"/>
-        <checked-group-node id="Routes"/>
-        <checked-group-node id="Map"/>
-        <checked-group-node id="Routes/Markers"/>
-      </checked-group-nodes>
-      <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
-        <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
-        <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
-        <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Map"/>
-        <expanded-group-node id="Routes/Markers"/>
-      </expanded-group-nodes>
-    </visibility-preset>
-    <visibility-preset name="Marshal map - inset" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
       <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
         <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
-      <layer style="default" id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
+      <checked-group-nodes>
+        <checked-group-node id="OSM data"/>
+        <checked-group-node id="Routes"/>
+        <checked-group-node id="Map"/>
+        <checked-group-node id="Fencing and Cones"/>
+        <checked-group-node id="Routes/Markers"/>
+      </checked-group-nodes>
+      <expanded-group-nodes>
+        <expanded-group-node id="Start and Finish pages"/>
+        <expanded-group-node id="OSM data"/>
+        <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
+        <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
+      </expanded-group-nodes>
+    </visibility-preset>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - inset">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="0" expanded="1" style="default"/>
       <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="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="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"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal map - main" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal map - main">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
       <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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
       <checked-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b">
         <checked-legend-node id="{3f752d3f-69d2-4062-89ea-bc54be0a9bca}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer style="default" id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <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="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"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Marshal overview" has-checked-group-info="1" has-expanded-info="1">
-      <layer style="default" id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Marshal overview">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
+      <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
+        <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
+      </expanded-legend-nodes>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
-      <layer 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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <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"/>
-      <layer style="default" id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
-      <layer 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"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="0" style="default"/>
       <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <layer style="default" id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
-        <checked-group-node id="Feeding Stations"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
-        <checked-group-node id="Routes/Markers"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
+        <checked-group-node id="Feeding Stations"/>
+        <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
-        <expanded-group-node id="Routes/Markers"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
+        <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Routes" has-checked-group-info="1" has-expanded-info="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 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="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
-      <layer style="default" id="water_tables20170921142016467" visible="0" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1"/>
+    <visibility-preset has-expanded-info="1" has-checked-group-info="1" name="Routes">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="0" expanded="1" style="Fencing"/>
       <checked-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <checked-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
-        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
-        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
         <checked-legend-node id="{55e15f58-d121-44dd-9fec-2e77eb26097f}"/>
         <checked-legend-node id="{070da3c0-926e-4be7-b593-17a3235a88fa}"/>
+        <checked-legend-node id="{7be11354-6d79-48d0-a650-aea5f58c1846}"/>
+        <checked-legend-node id="{2ae08294-ce6f-4621-b1c6-cb74effe94f1}"/>
       </checked-legend-nodes>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab">
         <expanded-legend-node id="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}"/>
       </expanded-legend-nodes>
-      <layer 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"/>
+      <layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" visible="1" expanded="1" style="default"/>
+      <checked-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190">
+        <checked-legend-node id="{5ad76477-9b0f-497b-9eea-bcbe9ec001c9}"/>
+      </checked-legend-nodes>
+      <expanded-legend-nodes id="all_routes_5833accf_77da_42ef_a24a_197208cd2190"/>
+      <layer id="water_tables20170921142016467" visible="0" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="Outlines_e5e4a673_227a_4335_86fb_ddc505fdb48d"/>
+      <layer id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="route_markers_9a77854e_0d42_4552_9f77_386b6a81a76e"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <checked-group-nodes>
-        <checked-group-node id="Marshals"/>
         <checked-group-node id="OSM data"/>
         <checked-group-node id="Routes"/>
+        <checked-group-node id="Marshals"/>
         <checked-group-node id="Map"/>
         <checked-group-node id="Routes/Markers"/>
       </checked-group-nodes>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
-    <visibility-preset name="Start/Finish" has-expanded-info="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="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="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
-      <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="water_tables20170921142016467" visible="1" expanded="1"/>
-      <expanded-legend-nodes id="water_tables20170921142016467"/>
-      <layer style="Fencing" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1"/>
+    <visibility-preset has-expanded-info="1" name="Start/Finish">
+      <layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" visible="1" expanded="1" style="Fencing"/>
       <expanded-legend-nodes id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab"/>
-      <layer style="default" id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1"/>
+      <layer id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="data_comments_e61852a4_3d9d_45fa_b864_84c2662ecb12"/>
+      <layer id="water_tables20170921142016467" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="water_tables20170921142016467"/>
+      <layer id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18" visible="1" expanded="0" style="default"/>
+      <expanded-legend-nodes id="osm_roads_1ec139c4_2a8a_4e08_b9fe_731eac6a1f18"/>
+      <layer id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b"/>
+      <layer id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970" visible="1" expanded="1" style="default"/>
+      <expanded-legend-nodes id="GDAL_City_of_Cape_Town_2015_Aerial20160928085834970"/>
+      <layer id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d" visible="1" expanded="1" style="default"/>
       <expanded-legend-nodes id="osm_places_69db09d8_86df_4913_820d_b57b32cc332d"/>
       <expanded-group-nodes>
-        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Start and Finish pages"/>
-        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Marshal pages"/>
         <expanded-group-node id="OSM data"/>
-        <expanded-group-node id="Fencing and Cones"/>
         <expanded-group-node id="Routes"/>
+        <expanded-group-node id="Marshals"/>
         <expanded-group-node id="Map"/>
+        <expanded-group-node id="Fencing and Cones"/>
+        <expanded-group-node id="Feeding Stations"/>
         <expanded-group-node id="Routes/Markers"/>
       </expanded-group-nodes>
     </visibility-preset>
@@ -28001,11 +28002,11 @@ def my_form_open(dialog, layer, feature):
   </projectMetadata>
   <Annotations/>
   <Layouts>
-    <Layout printResolution="120" worldFileMap="" units="mm" name="Marshals">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshals" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28013,7 +28014,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28047,9 +28048,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" referencePoint="0" templateUuid="{0cf02dfe-324a-434f-8e8f-c45c530be310}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28062,7 +28063,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28070,7 +28071,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28107,9 +28108,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="5" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="19.9422,32,mm" titleAlignment="1" position="128.508,3.98741,mm" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="128.508,3.98741,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="bevel" wmsLegendHeight="25" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.1,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="128" green="128" red="128"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="128.508,3.98741,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="5" background="true" symbolWidth="7" templateUuid="{85c3cfc6-a1ab-4968-81a1-1bb325221ed2}" blendMode="0" opacity="1" position="128.508,3.98741,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.1,mm" size="19.9422,32,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="bevel" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="128" blue="128" alpha="255" red="128"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28123,31 +28124,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,12,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,11,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="1" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,9,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,8,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -28161,9 +28162,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="56.5192,54.5647,mm" groupUuid="" frame="true" followPresetName="Marshal map - inset" excludeFromExports="0" position="98.7828,149.027,mm" followPreset="true" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.2,mm" positionLock="true" blendMode="0" zValue="4" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" id="Inset map" mapFlags="0" positionOnPage="98.7828,149.027,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Inset map" uuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" referencePoint="0" templateUuid="{e76b28a5-812a-465c-8f3e-47a33a139b7e}" position="98.7828,149.027,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="56.5192,54.5647,mm" mapFlags="0" positionLock="true" positionOnPage="98.7828,149.027,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - inset" outlineWidthM="0.2,mm" frame="true" itemRotation="0" zValue="4" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28176,11 +28177,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94603505205213878" ymax="-33.94188878914365404" xmax="18.42218047871277165" xmin="18.41788569471234993"/>
+        <Extent xmin="18.41788569471234993" xmax="18.42218047871277165" ymax="-33.94188878914365404" ymin="-33.94603505205213878"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3ef84102-ed03-4cdc-8cad-41bf1801eda2}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28188,7 +28189,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28256,7 +28257,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28264,7 +28265,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28315,12 +28316,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28328,7 +28329,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28363,7 +28364,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28385,8 +28386,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="1" frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" inverted="0" show="1" name="Overview 1" blendMode="0" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3">
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <ComposerMapOverview frameMap="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{00880e74-3a34-4c80-a062-9e7dfc538d75}" position="3" centered="1">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28394,7 +28395,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,65,170,127" type="QString"/>
@@ -28443,14 +28444,14 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="142,187.018,mm" groupUuid="" frame="false" followPresetName="Marshal map - main" excludeFromExports="0" position="3.53,6.0007,mm" followPreset="true" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" isTemporal="0" background="false" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" id="Main map" mapFlags="0" positionOnPage="3.53,6.0007,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Main map" uuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" referencePoint="0" templateUuid="{ec680945-6cfd-4643-b22d-d8b3f1e45c5e}" position="3.53,6.0007,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="142,187.018,mm" mapFlags="0" positionLock="true" positionOnPage="3.53,6.0007,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal map - main" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28463,11 +28464,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94463864108302431" ymax="-33.94328520011277561" xmax="18.42054691083765405" xmin="18.41951926258746752"/>
+        <Extent xmin="18.41951926258746752" xmax="18.42054691083765405" ymax="-33.94328520011277561" ymin="-33.94463864108302431"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{c6f52ccd-dffd-428e-8bbf-f3d65e856d30}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28475,7 +28476,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -28543,7 +28544,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28551,7 +28552,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -28602,12 +28603,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -28615,7 +28616,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28650,7 +28651,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28674,14 +28675,14 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem hideBackgroundIfEmpty="0" referencePoint="2" type="65647" opacity="1" size="142.117,187.018,mm" groupUuid="" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" frame="false" excludeFromExports="0" position="290.617,6.0007,mm" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" background="false" hidePageIfEmpty="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" sectionY="0" blendMode="0" zValue="2" sectionHeight="187.018" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" id="" sectionX="0" positionOnPage="290.617,6.0007,mm" frameJoinStyle="round" sectionWidth="142.117" visibility="1">
-        <FrameColor alpha="255" blue="119" green="119" red="119"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}" multiFrameTemplateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" referencePoint="2" templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" position="290.617,6.0007,mm" sectionWidth="142.117" blendMode="0" opacity="1" hidePageIfEmpty="0" size="142.117,187.018,mm" positionLock="true" positionOnPage="290.617,6.0007,mm" multiFrame="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" sectionHeight="187.018" groupUuid="" hideBackgroundIfEmpty="0" excludeFromExports="0" background="false" frameJoinStyle="round" visibility="1" sectionX="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" sectionY="0" zValue="2" type="65647">
+        <FrameColor green="119" blue="119" alpha="255" red="119"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28695,9 +28696,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="0" pictureHeight="25.2491" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="47.1065" svgFillColor="255,255,255,255" size="47.1065,27.6,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="246.665,178.41,mm" mapUuid="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" file="../GunRun2022_500.png" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" id="" positionOnPage="246.665,178.41,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" referencePoint="0" templateUuid="{b13d82c7-38bf-47ec-b20a-b0c998ee1685}" position="246.665,178.41,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="25.2491" size="47.1065,27.6,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="246.665,178.41,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_500.png" pictureWidth="47.1065" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28717,7 +28718,7 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutMultiFrame contentMode="1" maxBreakDistance="12" url="" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" useSmartBreaks="true" stylesheetEnabled="true" evaluateExpressions="true" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" resizeMode="0" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}">
+      <LayoutMultiFrame contentMode="1" stylesheet="td, p {&#xa;&#x9;font-family: &quot;Myriad Pro&quot;, sans-serif;&#xa;&#x9;font-size: 5pt;&#xa;}&#xa;p {&#xa;&#x9;text-align: justify;&#xa;}&#xa;b{&#xa;&#x9;font-weight: 600;&#xa;}" stylesheetEnabled="true" resizeMode="0" templateUuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" evaluateExpressions="true" maxBreakDistance="12" useSmartBreaks="true" uuid="{669cc9c6-a2c2-47f1-a7dd-fb7e64025f5a}" type="65648" html="&lt;table>&#xa;&lt;tr>&lt;td width=&quot;45%&quot;>Position&lt;/td>&lt;td width=&quot;55%&quot;>&lt;b>[%&quot;position&quot;%]&lt;/b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Club &lt;/td>&lt;td>[%&quot;csv_club&quot;%]&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>Captain&lt;/td>&lt;td>[%&quot;csv_captain&quot;%]&lt;/td>&lt;/tr>&#xa;&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;tr>&lt;td>Last Runner&lt;/td>&lt;td>', '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, &quot;csv_last_runner&quot;, '')%]&#xa;[%if ( &quot;csv_last_runner&quot;, '&lt;/td>&lt;tr>', '')%]&#xa;&#xa;&lt;tr>&lt;td colspan=2>&lt;b>Contact Numbers&lt;b>&lt;/td>&lt;/tr>&#xa;&lt;tr>&lt;td>VOC&lt;/td>&lt;td width=&quot;120&quot;>&lt;b>021 430 7374&amp;nbsp;&amp;nbsp;(emergencies)&lt;/b>&lt;/td>&lt;/tr>&#xa;&#xa;&lt;tr>&lt;td>[%&quot;csv_captain&quot;%]&amp;nbsp;&lt;/td>&lt;td>[%&quot;csv_captain_phone&quot;%]&lt;/td>&lt;tr>&#xa;&#xa;&lt;tr>&lt;td>Roger Steward &lt;/td>&lt;td>081 037 3033 &lt;/td>&lt;/tr>&#xa;&lt;/table>&#xa;&#xa;&lt;p>&lt;b>[% &quot;csv_instructions&quot; %]&lt;/b>&lt;/p>&#xa;&#xa;&lt;p>Please return your bib and flag to the information desk at the finish (accessible from Vlei Road or Stephen Way).&lt;/p>&#xa;&lt;p style=&quot;text-align: right&quot;>Thank you!&lt;/p>" url="">
         <childFrame templateUuid="{29f4a843-0516-4360-b00e-581dbc907eda}" uuid="{29f4a843-0516-4360-b00e-581dbc907eda}"/>
         <LayoutObject>
           <dataDefinedProperties>
@@ -28754,13 +28755,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;position&quot;" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortKey="&quot;id&quot;" coverageLayerName="marshal_positions" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" hideCoverage="0" sortAscending="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal_positions.shp|layername=marshal_positions" coverageLayer="marshal_positions_39c452f5_fe2c_4fa8_98dd_141891401d8b" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="&quot;csv_club&quot;||'_marshal_map_'||&quot;position&quot;" sortAscending="1" pageNameExpression="&quot;position&quot;" sortKey="&quot;id&quot;" enabled="1" hideCoverage="0" coverageLayerName="marshal_positions"/>
     </Layout>
-    <Layout printResolution="300" worldFileMap="" units="mm" name="Start &amp; Finish Backgrounds">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Start &amp; Finish Backgrounds" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28768,7 +28769,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28802,9 +28803,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" referencePoint="0" templateUuid="{99909262-ca5b-4051-ad48-bc17ea11040f}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -28817,7 +28818,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -28825,7 +28826,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28862,9 +28863,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="0" pictureHeight="7.97477" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="6.31767" svgFillColor="255,255,255,255" size="9.45865,11,mm" groupUuid="" pictureRotation="330" frame="false" northMode="0" excludeFromExports="0" position="286.027,2,mm" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" svgBorderWidth="0.2" mode="0" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="arrows/NorthArrow_11.svg" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" id="" positionOnPage="286.027,2,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" referencePoint="0" templateUuid="{b5de00dc-e2c5-47c5-847d-354052d0d2a3}" position="286.027,2,mm" anchorPoint="0" blendMode="0" opacity="1" pictureHeight="7.97477" size="9.45865,11,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="286.027,2,mm" svgBorderColor="0,0,0,255" northMode="0" file="arrows/NorthArrow_11.svg" pictureWidth="6.31767" groupUuid="" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="330" visibility="1" mode="0" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28884,9 +28885,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="142.543,10.3185,mm" groupUuid="" frame="false" excludeFromExports="0" position="285.027,205.886,mm" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" background="false" marginY="1" itemRotation="270" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="3" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" id="" labelText="[%upper( &quot;area&quot; )%]" positionOnPage="285.027,205.886,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" halign="1" referencePoint="0" labelText="[%upper( &quot;area&quot; )%]" marginX="1" templateUuid="{839c913c-dcc6-4506-b1f9-492f13ea3ff1}" position="285.027,205.886,mm" blendMode="0" opacity="1" size="142.543,10.3185,mm" positionLock="true" positionOnPage="285.027,205.886,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="270" valign="64" zValue="3" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28899,12 +28900,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28912,7 +28913,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -28947,7 +28948,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -28957,9 +28958,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem segmentMillimeters="26.3519" numSubdivisions="1" background="false" groupUuid="" positionLock="true" lineCapStyle="square" segmentSizeMode="1" blendMode="0" labelVerticalPlacement="0" numSegmentsLeft="2" type="65646" labelBarSpace="3" height="3" lineJoinStyle="miter" outlineWidth="0.3" numUnitsPerSegment="100" visibility="1" style="Single Box" id="" itemRotation="0" boxContentSpace="1" zValue="2" excludeFromExports="0" referencePoint="0" size="145.54,16.2165,mm" alignment="0" position="7,189.669,mm" minBarWidth="50" uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" unitType="meters" maxBarWidth="150" positionOnPage="7,189.669,mm" labelHorizontalPlacement="0" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" frameJoinStyle="miter" unitLabel="m" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" opacity="1" subdivisionsHeight="1.5" numMapUnitsPerScaleBarUnit="1" numSegments="4" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem uuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" lineJoinStyle="miter" style="Single Box" outlineWidth="0.3" segmentMillimeters="26.3519" alignment="0" referencePoint="0" positionOnPage="7,189.669,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="50" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="1" labelBarSpace="3" mapUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5eb710e7-681c-48d8-8bd6-0c9d68207f8c}" blendMode="0" opacity="1" position="7,189.669,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="150" outlineWidthM="0.3,mm" numSegments="4" unitLabel="m" size="145.54,16.2165,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="3" numUnitsPerSegment="100">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -28972,12 +28973,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -28985,7 +28986,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29020,7 +29021,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29029,7 +29030,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" value="" type="QChar"/>
@@ -29041,10 +29042,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29052,7 +29053,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -29120,7 +29121,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29128,7 +29129,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -29196,7 +29197,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29204,7 +29205,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -29272,7 +29273,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29280,7 +29281,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -29316,7 +29317,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29324,7 +29325,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29360,9 +29361,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="330" size="278.027,180.318,mm" groupUuid="" frame="false" followPresetName="Start/Finish" excludeFromExports="0" position="7,5.5,mm" followPreset="true" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" isTemporal="0" background="false" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" id="" mapFlags="0" positionOnPage="7,5.5,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" referencePoint="0" templateUuid="{3517af55-e545-4766-97e7-0aa1d32f21be}" position="7,5.5,mm" mapRotation="330" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="278.027,180.318,mm" mapFlags="0" positionLock="true" positionOnPage="7,5.5,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Start/Finish" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29391,11 +29392,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90494830469008747" ymax="-33.89880140828828559" xmax="18.41790915398017958" xmin="18.40843143571575169"/>
+        <Extent xmin="18.40843143571575169" xmax="18.41790915398017958" ymax="-33.89880140828828559" ymin="-33.90494830469008747"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="3" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="4" unit="1" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="3" annotationExpression="" gridFrameMargin="0" intervalY="5" intervalX="5" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29403,7 +29404,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -29471,7 +29472,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29479,7 +29480,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -29541,12 +29542,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -29554,7 +29555,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29589,7 +29590,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29613,10 +29614,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -29643,13 +29644,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="svgTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;area&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortKey="area" coverageLayerName="start_finish_area" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/start_finish_area.shp" coverageLayer="start_finish_area_8350bda7_6dec_4cbf_bbbb_4dcba1206efe" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;area&quot;" sortKey="area" enabled="1" hideCoverage="1" coverageLayerName="start_finish_area"/>
     </Layout>
-    <Layout printResolution="300" worldFileMap="" units="mm" name="Fencing">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="300" name="Fencing" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29657,7 +29658,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29691,9 +29692,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" referencePoint="0" templateUuid="{7274a2a1-cb82-497d-b27c-825ac96ac585}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -29706,7 +29707,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -29714,7 +29715,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29751,9 +29752,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="0" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="11" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="38.1563,67.2879,mm" titleAlignment="1" position="256.808,5.21277,mm" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="256.808,5.21277,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="256.808,5.21277,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="0" map_uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="true" equalColumnWidth="1" itemRotation="0" zValue="11" background="true" symbolWidth="7" templateUuid="{83f6a4a9-b5ac-4f62-9d73-da94b2ef44ba}" blendMode="0" opacity="1" position="256.808,5.21277,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="38.1563,67.2879,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29767,31 +29768,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Bold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Bold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Bold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Fencing and Cones" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Fencing and Cones" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" providerKey="ogr" expanded="1" name="fencing" legend_exp="" patch_size="0,0" source="./fencing.shp|layername=fencing" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./fencing.shp|layername=fencing" checked="Qt::Checked" id="fencing_70522fe0_a771_4170_98b2_d5843f62a7ab" patch_size="0,0" expanded="1" providerKey="ogr" name="fencing" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{e540cd6b-ee7b-46f9-a7e7-1b57fdf41d5a}" type="QString"/>
@@ -29803,11 +29804,11 @@ def my_form_open(dialog, layer, feature):
               </customproperties>
             </layer-tree-layer>
           </layer-tree-group>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -29821,9 +29822,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="148.46,6.45211,mm" groupUuid="" frame="false" excludeFromExports="0" position="6.76779,191.188,mm" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="10" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" id="" labelText="FENCING: [% &quot;name&quot; %]" positionOnPage="6.76779,191.188,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{00558977-061b-4811-9651-3f50eed14a4c}" halign="1" referencePoint="0" labelText="FENCING: [% &quot;name&quot; %]" marginX="0" templateUuid="{00558977-061b-4811-9651-3f50eed14a4c}" position="6.76779,191.188,mm" blendMode="0" opacity="1" size="148.46,6.45211,mm" positionLock="true" positionOnPage="6.76779,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="10" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29836,12 +29837,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29849,7 +29850,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29884,7 +29885,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29894,9 +29895,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="1" size="56.3557,6.45237,mm" groupUuid="" frame="false" excludeFromExports="0" position="182.723,191.188,mm" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="9" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" id="" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" positionOnPage="182.723,191.188,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" halign="2" referencePoint="0" labelText="&lt;strong>[% if( regexp_match( &quot;day&quot;, '^1$' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]&lt;/strong>" marginX="0" templateUuid="{2f1de097-bfc1-4e3b-b990-ebe52d2f2100}" position="182.723,191.188,mm" blendMode="0" opacity="1" size="56.3557,6.45237,mm" positionLock="true" positionOnPage="182.723,191.188,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="9" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29909,12 +29910,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29922,7 +29923,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -29957,7 +29958,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -29967,9 +29968,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="26.8205,6.82826,mm" groupUuid="" frame="false" excludeFromExports="0" position="209.146,198.083,mm" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" id="" labelText="REVISION 2.0" positionOnPage="209.146,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" halign="2" referencePoint="0" labelText="REVISION 2.0" marginX="0" templateUuid="{dba17126-498c-4278-aa69-8644c0edb0ab}" position="209.146,198.083,mm" blendMode="0" opacity="1" size="26.8205,6.82826,mm" positionLock="true" positionOnPage="209.146,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -29982,12 +29983,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -29995,7 +29996,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30030,7 +30031,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30040,9 +30041,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="51.1638,7.07327,mm" groupUuid="" frame="false" excludeFromExports="0" position="62.6706,198.083,mm" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="7" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" id="" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" positionOnPage="62.6706,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" halign="1" referencePoint="0" labelText="Total fencing: [% round(&quot;fence_len&quot;, 0) %]m" marginX="1" templateUuid="{634a96b9-12bb-4151-bc02-2aaa72efd261}" position="62.6706,198.083,mm" blendMode="0" opacity="1" size="51.1638,7.07327,mm" positionLock="true" positionOnPage="62.6706,198.083,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30055,12 +30056,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30068,7 +30069,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30103,7 +30104,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30113,9 +30114,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="64.7594,7.10512,mm" groupUuid="" frame="false" excludeFromExports="0" position="116.805,198.083,mm" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="6" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" id="" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" positionOnPage="116.805,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" halign="1" referencePoint="0" labelText="Total cones: [% round(&quot;cone_len&quot;, 0) %]m" marginX="0" templateUuid="{e5d1fad8-cc7b-4ec5-82eb-c2fdb244a75d}" position="116.805,198.083,mm" blendMode="0" opacity="1" size="64.7594,7.10512,mm" positionLock="true" positionOnPage="116.805,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30128,12 +30129,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30141,7 +30142,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30176,7 +30177,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30186,9 +30187,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="52.7903,7.07327,mm" groupUuid="" frame="false" excludeFromExports="0" position="6.76779,198.083,mm" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="5" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" id="" labelText="Page [% @atlas_featurenumber %]" positionOnPage="6.76779,198.083,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" halign="1" referencePoint="0" labelText="Page [% @atlas_featurenumber %]" marginX="0" templateUuid="{77e6d179-7474-444a-aac0-171c8ef6a2e6}" position="6.76779,198.083,mm" blendMode="0" opacity="1" size="52.7903,7.07327,mm" positionLock="true" positionOnPage="6.76779,198.083,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30201,12 +30202,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30214,7 +30215,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30249,7 +30250,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30259,9 +30260,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="8" pictureHeight="26.4325" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" size="49.3143,29.8354,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="243.098,175.353,mm" mapUuid="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="../GunRun2022_250.png" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" id="" positionOnPage="243.098,175.353,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" referencePoint="0" templateUuid="{8a277f04-ac6d-4fa7-8bc0-d3d86484adbc}" position="243.098,175.353,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,29.8354,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.098,175.353,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30281,9 +30282,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="232.01,0.14328,mm" groupUuid="" frame="false" excludeFromExports="0" position="6.91779,197.79,mm" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" cornerRadiusMeasure="0,mm" id="" positionOnPage="6.91779,197.79,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" referencePoint="0" templateUuid="{097091b8-6f4c-422d-9444-9ee5bdfa4902}" position="6.91779,197.79,mm" blendMode="0" opacity="1" size="232.01,0.14328,mm" positionLock="true" positionOnPage="6.91779,197.79,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30296,7 +30297,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30304,7 +30305,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -30339,9 +30340,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem segmentMillimeters="32.0947" numSubdivisions="1" background="false" groupUuid="" positionLock="true" lineCapStyle="square" segmentSizeMode="1" blendMode="0" labelVerticalPlacement="0" numSegmentsLeft="2" type="65646" labelBarSpace="1" height="2" lineJoinStyle="round" outlineWidth="0.2" numUnitsPerSegment="20" visibility="1" style="Double Box" id="" itemRotation="0" boxContentSpace="0.2" zValue="2" excludeFromExports="0" referencePoint="0" size="106.045,15.8378,mm" alignment="0" position="6.76779,2.8482,mm" minBarWidth="25" uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" unitType="meters" maxBarWidth="100" positionOnPage="6.76779,2.8482,mm" labelHorizontalPlacement="0" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" frameJoinStyle="miter" unitLabel="m" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" opacity="1" subdivisionsHeight="1.5" numMapUnitsPerScaleBarUnit="1" numSegments="2" outlineWidthM="0.3,mm">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem uuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" lineJoinStyle="round" style="Double Box" outlineWidth="0.2" segmentMillimeters="32.0947" alignment="0" referencePoint="0" positionOnPage="6.76779,2.8482,mm" type="65646" labelHorizontalPlacement="0" minBarWidth="25" subdivisionsHeight="1.5" visibility="1" unitType="meters" boxContentSpace="0.2" labelBarSpace="1" mapUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" frame="false" itemRotation="0" segmentSizeMode="1" zValue="2" labelVerticalPlacement="0" background="false" lineCapStyle="square" templateUuid="{5269ee6e-ad76-424e-9ab5-13f94846e833}" blendMode="0" opacity="1" position="6.76779,2.8482,mm" positionLock="true" numMapUnitsPerScaleBarUnit="1" numSegmentsLeft="2" numSubdivisions="1" maxBarWidth="100" outlineWidthM="0.3,mm" numSegments="2" unitLabel="m" size="106.045,15.8378,mm" groupUuid="" excludeFromExports="0" frameJoinStyle="miter" id="" height="2" numUnitsPerSegment="20">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30354,12 +30355,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="0" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="0" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30367,7 +30368,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30402,7 +30403,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -30411,7 +30412,7 @@ def my_form_open(dialog, layer, feature):
             </Option>
           </dd_properties>
         </text-style>
-        <strokeColor alpha="255" blue="0" green="0" red="0"/>
+        <strokeColor green="0" blue="0" alpha="255" red="0"/>
         <numericFormat id="basic">
           <Option type="Map">
             <Option name="decimal_separator" value="" type="QChar"/>
@@ -30423,10 +30424,10 @@ def my_form_open(dialog, layer, feature):
             <Option name="thousand_separator" value="" type="QChar"/>
           </Option>
         </numericFormat>
-        <fillColor alpha="255" blue="0" green="0" red="0"/>
-        <fillColor2 alpha="255" blue="255" green="255" red="255"/>
+        <fillColor green="0" blue="0" alpha="255" red="0"/>
+        <fillColor2 green="255" blue="255" alpha="255" red="255"/>
         <lineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30434,7 +30435,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -30502,7 +30503,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </lineSymbol>
         <divisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30510,7 +30511,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -30578,7 +30579,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </divisionLineSymbol>
         <subdivisionLineSymbol>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30586,7 +30587,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+            <layer class="SimpleLine" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="align_dash_pattern" value="0" type="QString"/>
                 <Option name="capstyle" value="square" type="QString"/>
@@ -30654,7 +30655,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </subdivisionLineSymbol>
         <fillSymbol1>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30662,7 +30663,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="0,0,0,255" type="QString"/>
@@ -30698,7 +30699,7 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol1>
         <fillSymbol2>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -30706,7 +30707,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30742,9 +30743,9 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </fillSymbol2>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="0.9" mapRotation="0" size="283.418,180.92,mm" groupUuid="" frame="false" followPresetName="Fencing" excludeFromExports="0" position="6.76779,9.35102,mm" followPreset="true" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" isTemporal="0" background="false" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" id="" mapFlags="0" positionOnPage="6.76779,9.35102,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" referencePoint="0" templateUuid="{3586225b-004e-4368-ba40-d6d34ebb54e3}" position="6.76779,9.35102,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="0.9" size="283.418,180.92,mm" mapFlags="0" positionLock="true" positionOnPage="6.76779,9.35102,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="false" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Fencing" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -30779,7 +30780,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90819730717838354" ymax="-33.90718453497852636" xmax="18.40524827801807461" xmin="18.40366172969380543"/>
+        <Extent xmin="18.40366172969380543" xmax="18.40524827801807461" ymax="-33.90718453497852636" ymin="-33.90819730717838354"/>
         <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>
@@ -30794,9 +30795,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="3" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="4" unit="1" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="3" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="3" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="3" annotationExpression="" gridFrameMargin="0" intervalY="5" intervalX="5" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="4" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{3fccf43e-6565-49d2-85b6-710f1678ae68}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="3" offsetY="0" topAnnotationDisplay="3" gridFrameStyle="0" gridFrameMargin="0" unit="1" intervalY="5" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="5" gridStyle="0" blendMode="0" bottomAnnotationDisplay="3" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="3" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30804,7 +30805,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -30872,7 +30873,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -30880,7 +30881,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -30942,12 +30943,12 @@ def my_form_open(dialog, layer, feature):
             <ellipsoidacronym>EPSG:7030</ellipsoidacronym>
             <geographicflag>false</geographicflag>
           </spatialrefsys>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -30955,7 +30956,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -30990,7 +30991,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31014,10 +31015,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0.40000000000000002"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -31044,13 +31045,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="bool"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;name&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortKey="&quot;group&quot;" coverageLayerName="fence_groups" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20[geometry],%20[name],%20[group],%20[type],%20[day],SUM(cone_len)%20AS%20[cone_len],%20SUM(fence_len)%20AS%20[fence_len]%20FROM%20fencing%20GROUP%20BY%20%22group%22" coverageLayer="fence_groups_95022315_3b3e_4cd7_8762_6899a19efaeb" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;name&quot;" sortKey="&quot;group&quot;" enabled="1" hideCoverage="1" coverageLayerName="fence_groups"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" units="mm" name="Ask Me">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="9" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" printResolution="144" name="Ask Me" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="9" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31058,7 +31059,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31092,9 +31093,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" referencePoint="0" templateUuid="{768b4aca-91ac-4064-9e4e-5df8416e8c52}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31107,7 +31108,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31115,7 +31116,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31151,12 +31152,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="83.9998,10.4638,mm" groupUuid="" frame="false" excludeFromExports="0" position="4.43449,186.634,mm" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="8" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" id="" labelText="Directions to Start of Race" positionOnPage="4.43449,186.634,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" halign="1" referencePoint="0" labelText="Directions to Start of Race" marginX="1" templateUuid="{6fcd7e01-080b-4806-951f-5f5b0d4a6a18}" position="4.43449,186.634,mm" blendMode="0" opacity="1" size="83.9998,10.4638,mm" positionLock="false" positionOnPage="4.43449,186.634,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31169,12 +31170,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="14" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31182,7 +31183,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31217,7 +31218,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31227,9 +31228,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="48.2923,9.511,mm" groupUuid="" frame="false" excludeFromExports="0" position="4.43449,197.498,mm" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="7" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" id="" labelText="Gun Run" positionOnPage="4.43449,197.498,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" halign="1" referencePoint="0" labelText="Gun Run" marginX="1" templateUuid="{8f7f0eae-57a1-4c8d-a0fd-ce93baad9261}" position="4.43449,197.498,mm" blendMode="0" opacity="1" size="48.2923,9.511,mm" positionLock="false" positionOnPage="4.43449,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="7" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31242,12 +31243,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31255,7 +31256,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31290,7 +31291,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31300,9 +31301,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" background="true" groupUuid="" positionLock="false" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="9" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="6" symbolHeight="5" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="59.0766,76,mm" titleAlignment="1" position="10.096,10.8563,mm" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" equalColumnWidth="0" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" legendFilterByMap="1" columnSpace="0" positionOnPage="10.096,10.8563,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="round" wmsLegendHeight="25" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" opacity="1" boxSpace="2" lineSpacing="2" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="139" green="139" red="139"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="0" rasterBorder="1" uuid="{303369c1-d87e-43b5-837f-91af9bdece73}" title="" lineSpacing="2" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="10.096,10.8563,mm" type="65642" legendFilterByAtlas="0" symbolHeight="5" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" frame="true" equalColumnWidth="0" itemRotation="0" zValue="6" background="true" symbolWidth="9" templateUuid="{303369c1-d87e-43b5-837f-91af9bdece73}" blendMode="0" opacity="1" position="10.096,10.8563,mm" positionLock="false" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" legendFilterByMap="1" size="59.0766,76,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="round" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="139" blue="139" alpha="255" red="139"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31316,33 +31317,33 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,12,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2.5" marginLeft="3" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" marginLeft="3" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,14,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Ask Me" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Ask Me" groupLayer="">
             <customproperties>
               <Option type="Map">
                 <Option name="legend/title-style" value="hidden" type="QString"/>
               </Option>
             </customproperties>
-            <layer-tree-layer id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" providerKey="ogr" expanded="1" name="poi_labels" legend_exp="" patch_size="0,0" source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./poi_labels.shp|layername=poi_labels" checked="Qt::Checked" id="poi_labels_bdd0a30d_48fa_4e01_ac53_c3912aded48f" patch_size="0,0" expanded="1" providerKey="ogr" name="poi_labels" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="Start/Finish" type="QString"/>
@@ -31355,7 +31356,7 @@ def my_form_open(dialog, layer, feature):
                 </Option>
               </customproperties>
             </layer-tree-layer>
-            <layer-tree-layer id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" providerKey="ogr" expanded="1" name="directions_to_start" legend_exp="" patch_size="0,0" source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./directions_to_start.shp|layername=directions_to_start" checked="Qt::Checked" id="directions_to_start_5e2aacba_4e66_4315_a162_5aec56633fa4" patch_size="0,0" expanded="1" providerKey="ogr" name="directions_to_start" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="legend/label-0" value="To 21KM Start (06:30)" type="QString"/>
@@ -31369,9 +31370,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="27.7839,6.871,mm" groupUuid="" frame="false" excludeFromExports="0" position="221.862,190.027,mm" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="5" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" id="" labelText="REVISION 1.0" positionOnPage="221.862,190.027,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{8c278857-b58f-45f0-943b-7d249cbc188c}" position="221.862,190.027,mm" blendMode="0" opacity="1" size="27.7839,6.871,mm" positionLock="false" positionOnPage="221.862,190.027,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31384,12 +31385,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31397,7 +31398,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31432,7 +31433,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31442,9 +31443,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="51.6706,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="197.975,197.498,mm" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" marginX="1" blendMode="0" zValue="4" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="197.975,197.498,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{4affbb81-cb5d-461a-8c53-762526ebb0fe}" position="197.975,197.498,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="false" positionOnPage="197.975,197.498,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31457,12 +31458,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31470,7 +31471,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31505,7 +31506,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31515,9 +31516,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="24.3824" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="24.2337" svgFillColor="255,255,255,255" size="42.9838,24.3824,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="249.646,179.724,mm" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="3" file="../Gun_Run_Logo.png" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" id="" positionOnPage="249.646,179.724,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" referencePoint="0" templateUuid="{2992085a-4a10-4d71-87e8-94448ff4c380}" position="249.646,179.724,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="24.3824" size="42.9838,24.3824,mm" positionLock="false" svgBorderWidth="0.2" northOffset="0" positionOnPage="249.646,179.724,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="24.2337" groupUuid="" mapUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31537,9 +31538,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="244.912,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="4.58449,197.248,mm" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="2" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" cornerRadiusMeasure="0,mm" id="" positionOnPage="4.58449,197.248,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" referencePoint="0" templateUuid="{07e55f8e-f9d6-4390-b916-79f467839e02}" position="4.58449,197.248,mm" blendMode="0" opacity="1" size="244.912,0.1,mm" positionLock="false" positionOnPage="4.58449,197.248,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31552,7 +31553,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31560,7 +31561,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -31595,9 +31596,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="288.007,183.616,mm" groupUuid="" frame="false" followPresetName="Ask Me" excludeFromExports="0" position="4.43449,6.411,mm" followPreset="true" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="1" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" id="" mapFlags="0" positionOnPage="4.43449,6.411,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" referencePoint="0" templateUuid="{74884811-0a82-43f3-9eef-ad8ee3f7b0a1}" position="4.43449,6.411,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="288.007,183.616,mm" mapFlags="0" positionLock="false" positionOnPage="4.43449,6.411,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Ask Me" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31626,7 +31627,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90994364588821952" ymax="-33.8970204297764468" xmax="18.41789384089274151" xmin="18.39762336729721071"/>
+        <Extent xmin="18.39762336729721071" xmax="18.41789384089274151" 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>
@@ -31641,9 +31642,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31651,7 +31652,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -31719,7 +31720,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -31727,7 +31728,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -31778,12 +31779,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -31791,7 +31792,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31826,7 +31827,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31850,10 +31851,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -31871,13 +31872,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="0" pageNameExpression="" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" coverageLayer="" sortFeatures="0" hideCoverage="0" filterFeatures="0"/>
+      <Atlas coverageLayer="" sortFeatures="0" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - '||&quot;RouteLen&quot;||'KM rev '" pageNameExpression="" enabled="0" hideCoverage="0"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="" units="mm" name="Routes">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="144" name="Routes" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -31885,7 +31886,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31919,9 +31920,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" referencePoint="0" templateUuid="{730391ac-b022-4d18-9266-b06c70b8f0b6}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -31934,7 +31935,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -31942,7 +31943,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -31978,12 +31979,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="61.5373,6.8714,mm" groupUuid="" frame="false" excludeFromExports="0" position="200.171,199.082,mm" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="13" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" id="" labelText="REVISION 3.2" positionOnPage="200.171,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" halign="2" referencePoint="0" labelText="REVISION 3.2" marginX="0" templateUuid="{14395b34-359c-4bd8-bdb7-7d4b004244b4}" position="200.171,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.8714,mm" positionLock="true" positionOnPage="200.171,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="13" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -31996,12 +31997,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32009,7 +32010,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32044,7 +32045,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32054,9 +32055,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="61.5373,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.7863,192.073,mm" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="12" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" id="" labelText="Gun Run 2022: [%&quot;Source&quot;%]" positionOnPage="9.7863,192.073,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" halign="1" referencePoint="0" labelText="Gun Run 2022: [%&quot;Source&quot;%]" marginX="0" templateUuid="{db747fe9-ab36-4b53-8320-4fb3639143e6}" position="9.7863,192.073,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,192.073,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="12" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32069,12 +32070,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32082,7 +32083,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32117,7 +32118,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32127,9 +32128,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="61.5373,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.7863,199.082,mm" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" background="false" marginY="0" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="11" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" id="" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" positionOnPage="9.7863,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" halign="1" referencePoint="0" labelText="[% if( regexp_match( &quot;Source&quot;, '^(5|Trail)' ),&#xa; 'Saturday, 17 September 2022',&#xa; 'Sunday, 18 September 2022'&#xa;)%]" marginX="0" templateUuid="{7cde3a67-1cd1-4a3c-bb78-11ed5f819475}" position="9.7863,199.082,mm" blendMode="0" opacity="1" size="61.5373,6.60801,mm" positionLock="true" positionOnPage="9.7863,199.082,mm" marginY="0" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="11" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32142,12 +32143,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32155,7 +32156,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32190,7 +32191,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32200,9 +32201,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="15.9472" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="29.7523" svgFillColor="255,255,255,255" size="29.7523,17.4718,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="262.196,188.218,mm" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="10" file="../GunRun2022_250.png" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" id="" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" referencePoint="0" templateUuid="{b65f4564-9dff-46f5-81d8-4d7a08ab0bd8}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="15.9472" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="29.7523" groupUuid="" mapUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="10" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32222,9 +32223,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="251.982,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.57644,198.832,mm" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="9" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" cornerRadiusMeasure="0,mm" id="" positionOnPage="9.57644,198.832,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" referencePoint="0" templateUuid="{eaa34aa7-9bc5-45ad-83a8-e0bea2f72311}" position="9.57644,198.832,mm" blendMode="0" opacity="1" size="251.982,0.1,mm" positionLock="true" positionOnPage="9.57644,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="9" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32237,7 +32238,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32245,7 +32246,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -32280,9 +32281,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="107.861,186.385,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="9.57644,5.42566,mm" followPreset="true" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="8" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" id="Trail Finish" mapFlags="0" positionOnPage="9.57644,5.42566,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Trail Finish" uuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" referencePoint="0" templateUuid="{84384199-9e4e-4638-8bce-bd5c9bc15ec4}" position="9.57644,5.42566,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="107.861,186.385,mm" mapFlags="0" positionLock="true" positionOnPage="9.57644,5.42566,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="8" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32301,18 +32302,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.93243205975926458" ymax="-33.90007566747966905" xmax="18.41187375074135701" xmin="18.39314911415855391"/>
+        <Extent xmin="18.39314911415855391" xmax="18.41187375074135701" ymax="-33.90007566747966905" ymin="-33.93243205975926458"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="179.156,189.279,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="112.643,4.09761,mm" followPreset="true" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="7" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" id="Trail Start" mapFlags="0" positionOnPage="112.643,4.09761,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Trail Start" uuid="{01af805d-ea17-430b-b08a-fc3789925456}" referencePoint="0" templateUuid="{01af805d-ea17-430b-b08a-fc3789925456}" position="112.643,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="179.156,189.279,mm" mapFlags="0" positionLock="true" positionOnPage="112.643,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="7" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32331,18 +32332,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95772328900195447" ymax="-33.92484901666441743" xmax="18.42354248737832023" xmin="18.3924263991010406"/>
+        <Extent xmin="18.3924263991010406" xmax="18.42354248737832023" ymax="-33.92484901666441743" ymin="-33.95772328900195447"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="67.7828,166.874,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="5.86559,4.09761,mm" followPreset="true" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="6" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" id="Left inset 21KM" mapFlags="0" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Left inset 21KM" uuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" referencePoint="0" templateUuid="{f557297c-8da4-42dc-b6a8-ac56a534adc2}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="6" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32386,18 +32387,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94700000000000273" ymax="-33.91681492292400435" xmax="18.38626092146919788" xmin="18.37399999999999878"/>
+        <Extent xmin="18.37399999999999878" xmax="18.38626092146919788" ymax="-33.91681492292400435" ymin="-33.94700000000000273"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="113.3,76.1023,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="133.191,119.125,mm" followPreset="true" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="5" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" id="Bottom inset 21KM" mapFlags="0" positionOnPage="133.191,119.125,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="144" green="34" red="103"/>
-        <BackgroundColor alpha="255" blue="215" green="175" red="200"/>
+      <LayoutItem id="Bottom inset 21KM" uuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" referencePoint="0" templateUuid="{4228b319-f275-4a0b-ac13-4898f517cf3f}" position="133.191,119.125,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="113.3,76.1023,mm" mapFlags="0" positionLock="true" positionOnPage="133.191,119.125,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="5" type="65639">
+        <FrameColor green="34" blue="144" alpha="255" red="103"/>
+        <BackgroundColor green="175" blue="215" alpha="255" red="200"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32416,18 +32417,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.9168317482614512" ymax="-33.91132718340826813" xmax="18.42329132157224336" xmin="18.41509620662891678"/>
+        <Extent xmin="18.41509620662891678" xmax="18.42329132157224336" ymax="-33.91132718340826813" ymin="-33.9168317482614512"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="0" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="68.3676,117.12,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="19.6693,7.89412,mm" followPreset="true" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" id="End inset Trail" mapFlags="0" positionOnPage="19.6693,7.89412,mm" frameJoinStyle="miter" visibility="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="End inset Trail" uuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" referencePoint="0" templateUuid="{049d9e83-6801-4e4c-b598-d6a49a1d9d81}" position="19.6693,7.89412,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="68.3676,117.12,mm" mapFlags="0" positionLock="true" positionOnPage="19.6693,7.89412,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="4" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32446,18 +32447,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.91454383501641701" ymax="-33.90099106513847005" xmax="18.41240136424316276" xmin="18.4044900556177744"/>
+        <Extent xmin="18.4044900556177744" xmax="18.41240136424316276" ymax="-33.90099106513847005" ymin="-33.91454383501641701"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="63.655,88.3012,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="170.062,49.6297,mm" followPreset="true" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" id="Start inset Trail" mapFlags="0" positionOnPage="170.062,49.6297,mm" frameJoinStyle="miter" visibility="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Start inset Trail" uuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" referencePoint="0" templateUuid="{e02b974b-51c7-4d24-8314-a65c125ff5d1}" position="170.062,49.6297,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="63.655,88.3012,mm" mapFlags="0" positionLock="true" positionOnPage="170.062,49.6297,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="3" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32476,18 +32477,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94823764719958348" ymax="-33.94253141264477591" xmax="18.4185691326545431" xmin="18.41445559427620893"/>
+        <Extent xmin="18.41445559427620893" xmax="18.4185691326545431" ymax="-33.94253141264477591" ymin="-33.94823764719958348"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="75.8756,69.7635,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="200.321,125.314,mm" followPreset="true" uuid="{917a530c-14f4-4ed8-b109-961939435221}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" id="Contour inset Trail" mapFlags="0" positionOnPage="200.321,125.314,mm" frameJoinStyle="miter" visibility="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Contour inset Trail" uuid="{917a530c-14f4-4ed8-b109-961939435221}" referencePoint="0" templateUuid="{917a530c-14f4-4ed8-b109-961939435221}" position="200.321,125.314,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="75.8756,69.7635,mm" mapFlags="0" positionLock="true" positionOnPage="200.321,125.314,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="0" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32506,18 +32507,18 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95702588572736147" ymax="-33.94692690566557047" xmax="18.42332635419156972" xmin="18.41234259163472942"/>
+        <Extent xmin="18.41234259163472942" xmax="18.42332635419156972" ymax="-33.94692690566557047" ymin="-33.95702588572736147"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="1">
+        <atlasClippingSettings clippingType="1" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="1"/>
+        <itemClippingSettings clipSource="" clippingType="1" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="true" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="282.372,186.105,mm" groupUuid="" frame="true" followPresetName="Routes" excludeFromExports="0" position="9.50144,5.50066,mm" followPreset="true" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.15,mm" positionLock="false" blendMode="0" zValue="1" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" id="Main Map" mapFlags="0" positionOnPage="9.50144,5.50066,mm" frameJoinStyle="round" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="Main Map" uuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" referencePoint="0" templateUuid="{7fdb4012-c1aa-452c-bf1d-2c007710e1c0}" position="9.50144,5.50066,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.372,186.105,mm" mapFlags="0" positionLock="false" positionOnPage="9.50144,5.50066,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="true" followPresetName="Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32546,11 +32547,11 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95900000000000318" ymax="-33.89975491900725046" xmax="18.45389078049076304" xmin="18.36400000000000077"/>
+        <Extent xmin="18.36400000000000077" xmax="18.45389078049076304" ymax="-33.89975491900725046" ymin="-33.95900000000000318"/>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32558,7 +32559,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -32626,7 +32627,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -32634,7 +32635,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -32685,12 +32686,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -32698,7 +32699,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32733,7 +32734,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -32755,8 +32756,8 @@ def my_form_open(dialog, layer, feature):
             </customproperties>
           </LayoutObject>
         </ComposerMapGrid>
-        <ComposerMapOverview centered="0" frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" inverted="0" show="1" name="Overview 1" blendMode="0" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3">
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <ComposerMapOverview frameMap="{4228b319-f275-4a0b-ac13-4898f517cf3f}" blendMode="0" show="1" inverted="0" name="Overview 1" uuid="{e010b26c-eb3c-4800-b436-eead87b4cf37}" position="3" centered="0">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -32770,7 +32771,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="103,34,144,26" type="QString"/>
@@ -32819,10 +32820,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapOverview>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.06"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -32847,13 +32848,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="true" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;Distance&quot;" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" sortKey="&quot;Sort&quot;" coverageLayerName="all_routes" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" hideCoverage="0" sortAscending="1" filterFeatures="1" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/all_routes.shp|layername=all_routes" coverageLayer="all_routes_5833accf_77da_42ef_a24a_197208cd2190" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="1" filenamePattern="format_date( now() , 'yyyyMMdd') || ' - Gun Run ' || format_date( now() , 'yyyy') || ' - Routes - '||&quot;RouteLen&quot;||'KM rev'" sortAscending="1" pageNameExpression="&quot;Distance&quot;" sortKey="&quot;Sort&quot;" featureFilter="regexp_match( &quot;Source&quot;, '^(5|10|21|Trail)' )" enabled="1" hideCoverage="0" coverageLayerName="all_routes"/>
     </Layout>
-    <Layout printResolution="120" worldFileMap="" units="mm" name="Marshal Plan A1">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshal Plan A1" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -32861,7 +32862,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32895,9 +32896,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="594,841,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" referencePoint="0" templateUuid="{5ee6fc69-ca7b-4f84-a2d6-64836041ae1b}" position="0,0,mm" blendMode="0" opacity="1" size="594,841,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -32910,7 +32911,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -32918,7 +32919,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -32955,9 +32956,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="8" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="4,4,mm" titleAlignment="1" position="25.5925,18.7971,mm" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="25.5925,18.7971,mm" rasterBorderWidth="0" frame="false" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="25.5925,18.7971,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="8" background="true" symbolWidth="7" templateUuid="{b2dde923-d577-4a2c-9e7a-423fda1df333}" blendMode="0" opacity="1" position="25.5925,18.7971,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="4,4,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -32971,31 +32972,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="1" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes20170907054841602" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer checked="Qt::Checked" id="all_routes20170907054841602" patch_size="0,0" expanded="1" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" value="{311b5a7e-2b1c-48f8-8a4a-6894f594ec4b}" type="QString"/>
@@ -33009,9 +33010,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="91.9494,15.0649,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.2963,808.939,mm" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="7" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" id="" labelText="MARSHAL POSITIONS" positionOnPage="5.2963,808.939,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="1" templateUuid="{9efbfe1c-c990-4414-9507-bb17edb35000}" position="5.2963,808.939,mm" blendMode="0" opacity="1" size="91.9494,15.0649,mm" positionLock="true" positionOnPage="5.2963,808.939,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="7" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33024,12 +33025,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33037,7 +33038,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33072,7 +33073,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33082,9 +33083,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="56.6212,15.3656,mm" groupUuid="" frame="false" excludeFromExports="0" position="430.403,825.052,mm" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="5" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" id="" labelText="REVISION 1.2" positionOnPage="430.403,825.052,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{16fde111-eb96-4679-a00f-a129be4e506a}" halign="2" referencePoint="0" labelText="REVISION 1.2" marginX="1" templateUuid="{16fde111-eb96-4679-a00f-a129be4e506a}" position="430.403,825.052,mm" blendMode="0" opacity="1" size="56.6212,15.3656,mm" positionLock="true" positionOnPage="430.403,825.052,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33097,12 +33098,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33110,7 +33111,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33145,7 +33146,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33155,9 +33156,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="114.848,15.0635,mm" groupUuid="" frame="false" excludeFromExports="0" position="372.175,808.942,mm" uuid="{d177957c-7ab6-40ae-8769-347428500538}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="4" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="372.175,808.942,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{d177957c-7ab6-40ae-8769-347428500538}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{d177957c-7ab6-40ae-8769-347428500538}" position="372.175,808.942,mm" blendMode="0" opacity="1" size="114.848,15.0635,mm" positionLock="true" positionOnPage="372.175,808.942,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33170,12 +33171,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33183,7 +33184,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33218,7 +33219,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33228,9 +33229,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="8" pictureHeight="63.9757" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="63.5856" svgFillColor="255,255,255,255" size="100.498,63.9757,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="489.557,775.395,mm" mapUuid="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" file="../Gun_Run_Logo.png" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" id="" positionOnPage="489.557,775.395,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" referencePoint="0" templateUuid="{52cc6d8b-e13c-4893-aa7e-1ab03c46a776}" position="489.557,775.395,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="63.9757" size="100.498,63.9757,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="489.557,775.395,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="63.5856" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33250,9 +33251,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="481.428,0.606138,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.4463,824.155,mm" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" cornerRadiusMeasure="0,mm" id="" positionOnPage="5.4463,824.155,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{cc073cea-0811-4548-bfd7-924edac8690f}" referencePoint="0" templateUuid="{cc073cea-0811-4548-bfd7-924edac8690f}" position="5.4463,824.155,mm" blendMode="0" opacity="1" size="481.428,0.606138,mm" positionLock="true" positionOnPage="5.4463,824.155,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33265,7 +33266,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33273,7 +33274,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -33308,9 +33309,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="584.759,811.213,mm" groupUuid="" frame="true" followPresetName="Marshal overview" excludeFromExports="0" position="3.94474,5.25965,mm" followPreset="true" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" id="" mapFlags="0" positionOnPage="3.94474,5.25965,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" referencePoint="0" templateUuid="{1f3d7f60-3813-4fc5-a2ff-ea2cc7961a2b}" position="3.94474,5.25965,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="584.759,811.213,mm" mapFlags="0" positionLock="true" positionOnPage="3.94474,5.25965,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal overview" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33339,14 +33340,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.95821655848814657" ymax="-33.89072661913806428" xmax="18.42299397558693741" xmin="18.37434415142052657"/>
+        <Extent xmin="18.37434415142052657" xmax="18.42299397558693741" ymax="-33.89072661913806428" ymin="-33.95821655848814657"/>
         <LayerSet/>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -33357,13 +33358,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortKey="page" coverageLayerName="complete_marshal_overview" sortFeatures="1" coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="virtual"/>
+      <Atlas coverageLayerSource="?query=SELECT%20Extent(geometry)%20AS%20geometry,%20*%20FROM%20marshal_overviews" coverageLayer="complete_marshal_overview_0d14698f_c481_4d74_8f19_349a62b4ceb8" sortFeatures="1" coverageLayerProvider="virtual" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="complete_marshal_overview"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="" units="mm" name="Access Roads">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="144" name="Access Roads" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33371,7 +33372,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33405,9 +33406,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" referencePoint="0" templateUuid="{fbe3bfd9-ef12-416e-b79c-304ce1bf19ca}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -33420,7 +33421,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -33428,7 +33429,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33464,12 +33465,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="15" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="34.45,40.8,mm" titleAlignment="1" position="244.484,130.172,mm" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" equalColumnWidth="0" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="244.484,130.172,mm" rasterBorderWidth="0" frame="true" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="185" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="244.484,130.172,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" frame="true" equalColumnWidth="0" itemRotation="0" zValue="15" background="true" symbolWidth="7" templateUuid="{180a06b0-3ecd-4ed8-af60-a7036fa726ff}" blendMode="0" opacity="1" position="244.484,130.172,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="34.45,40.8,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="185" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33483,31 +33484,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="group" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,12,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="3" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="3" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2.5" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2.5" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,9,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Regular" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Regular" description="Myriad Pro,10,-1,5,50,0,0,0,0,0,Regular" italic="0" bold="0"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Residents Access" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Residents Access" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" providerKey="ogr" expanded="1" name="residents_access_roads" legend_exp="" patch_size="0,0" source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./residents_access_roads.shp|layername=residents_access_roads" checked="Qt::Checked" id="residents_access_roads_bf5f3b28_f62a_45b6_a369_9f8409bfddec" patch_size="0,0" expanded="1" providerKey="ogr" name="residents_access_roads" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -33519,9 +33520,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="194.851,7.272,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.37446,191.81,mm" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" id="" labelText="ACCESS ROUTES FOR RESIDENTS" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" halign="1" referencePoint="0" labelText="ACCESS ROUTES FOR RESIDENTS" marginX="0" templateUuid="{1dd621bc-b49d-4a43-bc89-7d5eed7cd57a}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33534,12 +33535,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="14" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33547,7 +33548,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33582,7 +33583,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33592,9 +33593,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="57.4836,6.8714,mm" groupUuid="" frame="false" excludeFromExports="0" position="204.225,191.81,mm" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="6" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" id="" labelText="REVISION 1.1" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" halign="2" referencePoint="0" labelText="REVISION 1.1" marginX="1" templateUuid="{86f55da9-0321-4722-98eb-d471418c2a3f}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33607,12 +33608,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33620,7 +33621,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33655,7 +33656,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33665,9 +33666,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="51.6706,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="210.038,199.082,mm" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="5" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{738c1132-b05a-4660-a0d6-98e233b998c1}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33680,12 +33681,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33693,7 +33694,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -33728,7 +33729,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33738,9 +33739,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="17.4718" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" size="29.7523,17.4718,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="262.196,188.218,mm" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="../Gun_Run_Logo.png" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" id="" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" referencePoint="0" templateUuid="{6b407f7e-a7e5-4922-82d7-d754acf75731}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33760,9 +33761,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="251.959,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.59946,198.832,mm" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" cornerRadiusMeasure="0,mm" id="" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{01219eef-e96b-45c3-a449-5e0250541019}" referencePoint="0" templateUuid="{01219eef-e96b-45c3-a449-5e0250541019}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33775,7 +33776,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -33783,7 +33784,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -33818,9 +33819,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="67.7828,166.874,mm" groupUuid="" frame="true" followPresetName="Access Routes" excludeFromExports="0" position="5.86559,4.09761,mm" followPreset="true" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" id="" mapFlags="0" positionOnPage="5.86559,4.09761,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" referencePoint="0" templateUuid="{fbc730ac-b731-4f2f-a1b3-64ad217e1a99}" position="5.86559,4.09761,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="67.7828,166.874,mm" mapFlags="0" positionLock="true" positionOnPage="5.86559,4.09761,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.3,mm" frame="true" itemRotation="0" zValue="2" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -33864,7 +33865,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94652930000000168" ymax="-33.91513741583252539" xmax="18.38563681624126289" xmin="18.37288570000000121"/>
+        <Extent xmin="18.37288570000000121" xmax="18.38563681624126289" 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>
@@ -33879,9 +33880,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{d5ac9dd4-df20-42c0-ae57-1f18c97b6a34}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33889,7 +33890,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -33957,7 +33958,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -33965,7 +33966,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -34016,12 +34017,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -34029,7 +34030,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34064,7 +34065,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -34088,14 +34089,14 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.05"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="282.012,175.592,mm" groupUuid="" frame="true" followPresetName="Access Routes" excludeFromExports="0" position="9.44946,9.08557,mm" followPreset="true" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.15,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" id="" mapFlags="0" positionOnPage="9.44946,9.08557,mm" frameJoinStyle="round" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" referencePoint="0" templateUuid="{a3e85f92-153b-43b7-b221-f1b6aa730cc2}" position="9.44946,9.08557,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,175.592,mm" mapFlags="0" positionLock="true" positionOnPage="9.44946,9.08557,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="Access Routes" outlineWidthM="0.15,mm" frame="true" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34124,7 +34125,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.92999999999999972" ymax="-33.89697816224119009" xmax="18.42303507276415431" xmin="18.37000000000000099"/>
+        <Extent xmin="18.37000000000000099" xmax="18.42303507276415431" 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>
@@ -34139,9 +34140,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34149,7 +34150,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -34217,7 +34218,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34225,7 +34226,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -34276,12 +34277,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -34289,7 +34290,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34324,7 +34325,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -34348,10 +34349,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -34369,13 +34370,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="1" hideCoverage="1" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="144" worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" units="mm" name="Golf Course Access">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="{1717b463-32cf-4d87-9f5a-0e8302026e12}" printResolution="144" name="Golf Course Access" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34383,7 +34384,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34417,9 +34418,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,210,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" referencePoint="0" templateUuid="{d00fe6c5-fbff-44b3-a9fe-dfb93fcc8cb0}" position="0,0,mm" blendMode="0" opacity="1" size="297,210,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -34432,7 +34433,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -34440,7 +34441,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34476,12 +34477,12 @@ def my_form_open(dialog, layer, feature):
           </symbol>
         </LayoutItem>
         <GuideCollection visible="1">
-          <Guide units="mm" orientation="2" page="0" position="0"/>
+          <Guide position="0" units="mm" page="0" orientation="2"/>
         </GuideCollection>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="194.851,7.272,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.37446,191.81,mm" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" id="" labelText="Access to P9 Parking and VIP Tent" positionOnPage="9.37446,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" halign="1" referencePoint="0" labelText="Access to P9 Parking and VIP Tent" marginX="0" templateUuid="{6742116d-a5b4-4c25-a9e3-475f01ec10a0}" position="9.37446,191.81,mm" blendMode="0" opacity="1" size="194.851,7.272,mm" positionLock="true" positionOnPage="9.37446,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34494,12 +34495,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="14" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="14" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34507,7 +34508,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34542,7 +34543,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34552,9 +34553,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="57.4836,6.8714,mm" groupUuid="" frame="false" excludeFromExports="0" position="204.225,191.81,mm" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="6" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" id="" labelText="REVISION 1.0" positionOnPage="204.225,191.81,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" halign="2" referencePoint="0" labelText="REVISION 1.0" marginX="1" templateUuid="{b1cfecdd-b192-43f2-b57f-6e44e61e5188}" position="204.225,191.81,mm" blendMode="0" opacity="1" size="57.4836,6.8714,mm" positionLock="true" positionOnPage="204.225,191.81,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34567,12 +34568,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34580,7 +34581,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34615,7 +34616,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34625,9 +34626,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="51.6706,6.60801,mm" groupUuid="" frame="false" excludeFromExports="0" position="210.038,199.082,mm" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="1" blendMode="0" zValue="5" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" id="" labelText="Sunday, 20 October 2019" positionOnPage="210.038,199.082,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" halign="2" referencePoint="0" labelText="Sunday, 20 October 2019" marginX="1" templateUuid="{bed54c99-88e9-47ea-a82f-22406f9c033a}" position="210.038,199.082,mm" blendMode="0" opacity="1" size="51.6706,6.60801,mm" positionLock="true" positionOnPage="210.038,199.082,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34640,12 +34641,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34653,7 +34654,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -34688,7 +34689,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34698,9 +34699,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="4" pictureHeight="17.4718" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="17.3653" svgFillColor="255,255,255,255" size="29.7523,17.4718,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="262.196,188.218,mm" mapUuid="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="4" file="../Gun_Run_Logo.png" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" id="" positionOnPage="262.196,188.218,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" referencePoint="0" templateUuid="{1eafa7a7-a099-4a6a-84f8-4ce02753ccdd}" position="262.196,188.218,mm" anchorPoint="4" blendMode="0" opacity="1" pictureHeight="17.4718" size="29.7523,17.4718,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="262.196,188.218,mm" svgBorderColor="0,0,0,255" northMode="0" file="../Gun_Run_Logo.png" pictureWidth="17.3653" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="4" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34720,9 +34721,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="251.959,0.1,mm" groupUuid="" frame="false" excludeFromExports="0" position="9.59946,198.832,mm" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" cornerRadiusMeasure="0,mm" id="" positionOnPage="9.59946,198.832,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{6df60d25-1d7e-4e06-8988-483618276a67}" referencePoint="0" templateUuid="{6df60d25-1d7e-4e06-8988-483618276a67}" position="9.59946,198.832,mm" blendMode="0" opacity="1" size="251.959,0.1,mm" positionLock="true" positionOnPage="9.59946,198.832,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34735,7 +34736,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -34743,7 +34744,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -34778,9 +34779,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="282.012,182.649,mm" groupUuid="" frame="false" followPresetName="" excludeFromExports="0" position="9.44946,7.25098,mm" followPreset="false" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.15,mm" positionLock="false" blendMode="0" zValue="1" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" id="" mapFlags="0" positionOnPage="9.44946,7.25098,mm" frameJoinStyle="round" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" referencePoint="0" templateUuid="{1717b463-32cf-4d87-9f5a-0e8302026e12}" position="9.44946,7.25098,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="282.012,182.649,mm" mapFlags="0" positionLock="false" positionOnPage="9.44946,7.25098,mm" keepLayerSet="false" groupUuid="" followPreset="false" excludeFromExports="0" background="true" frameJoinStyle="round" visibility="1" drawCanvasItems="false" followPresetName="" outlineWidthM="0.15,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -34809,7 +34810,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.90848231674397084" ymax="-33.90319854486631357" xmax="18.40919746780259914" xmin="18.40103928699269886"/>
+        <Extent xmin="18.40103928699269886" xmax="18.40919746780259914" 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>
@@ -34824,9 +34825,9 @@ def my_form_open(dialog, layer, feature):
           </spatialrefsys>
         </crs>
         <LayerSet/>
-        <ComposerMapGrid crossLength="3" leftAnnotationDisplay="0" blendMode="0" name="Grid 1" rightAnnotationDirection="0" rightAnnotationPosition="1" topFrameDivisions="0" rotatedAnnotationsMinimumAngle="0" rotatedTicksLengthMode="0" leftFrameDivisions="0" gridFramePenThickness="0.5" gridFramePenColor="0,0,0,255" maximumIntervalWidth="100" gridFrameSideFlags="15" bottomAnnotationDirection="0" minimumIntervalWidth="50" gridStyle="0" rotatedAnnotationsEnabled="0" offsetY="0" topAnnotationDirection="0" annotationFormat="0" unit="0" rotatedTicksMinimumAngle="0" rotatedAnnotationsLengthMode="0" frameFillColor1="255,255,255,255" rightAnnotationDisplay="0" rotatedTicksEnabled="0" show="0" frameAnnotationDistance="1" position="3" frameFillColor2="0,0,0,255" rightFrameDivisions="0" gridFrameWidth="2" rotatedTicksMarginToCorner="0" gridFrameStyle="0" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" leftAnnotationPosition="1" bottomFrameDivisions="0" offsetX="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationDisplay="0" rotatedAnnotationsMarginToCorner="0" topAnnotationDisplay="0" annotationExpression="" gridFrameMargin="0" intervalY="0" intervalX="0" bottomAnnotationPosition="1" showAnnotation="0" leftAnnotationDirection="0">
+        <ComposerMapGrid annotationFormat="0" rightAnnotationDirection="0" leftAnnotationPosition="1" uuid="{f198c91c-9f5b-4f5f-bb2d-11877d40fdfe}" rotatedAnnotationsLengthMode="0" gridFrameSideFlags="15" rotatedTicksMarginToCorner="0" show="0" topAnnotationPosition="1" annotationPrecision="3" bottomAnnotationPosition="1" showAnnotation="0" rotatedTicksLengthMode="0" annotationExpression="" leftAnnotationDirection="0" frameAnnotationDistance="1" rightAnnotationDisplay="0" offsetY="0" topAnnotationDisplay="0" gridFrameStyle="0" gridFrameMargin="0" unit="0" intervalY="0" rotatedAnnotationsEnabled="0" maximumIntervalWidth="100" rotatedTicksEnabled="0" rotatedAnnotationsMinimumAngle="0" rightFrameDivisions="0" offsetX="0" rotatedAnnotationsMarginToCorner="0" gridFramePenColor="0,0,0,255" crossLength="3" intervalX="0" gridStyle="0" blendMode="0" bottomAnnotationDisplay="0" position="3" gridFrameWidth="2" frameFillColor2="0,0,0,255" rotatedTicksMinimumAngle="0" rightAnnotationPosition="1" leftFrameDivisions="0" topFrameDivisions="0" minimumIntervalWidth="50" name="Grid 1" bottomFrameDivisions="0" gridFramePenThickness="0.5" leftAnnotationDisplay="0" frameFillColor1="255,255,255,255" topAnnotationDirection="0" bottomAnnotationDirection="0">
           <lineStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="line">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="line">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34834,7 +34835,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleLine" locked="0" pass="0">
+              <layer class="SimpleLine" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="align_dash_pattern" value="0" type="QString"/>
                   <Option name="capstyle" value="square" type="QString"/>
@@ -34902,7 +34903,7 @@ def my_form_open(dialog, layer, feature):
             </symbol>
           </lineStyle>
           <markerStyle>
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="marker">
+            <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="marker">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -34910,7 +34911,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleMarker" locked="0" pass="0">
+              <layer class="SimpleMarker" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="angle" value="0" type="QString"/>
                   <Option name="cap_style" value="square" type="QString"/>
@@ -34961,12 +34962,12 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </markerStyle>
-          <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="10" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+          <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="10" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
             <families/>
-            <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-            <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-            <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-              <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+            <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+            <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+            <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+              <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
                 <data_defined_properties>
                   <Option type="Map">
                     <Option name="name" value="" type="QString"/>
@@ -34974,7 +34975,7 @@ def my_form_open(dialog, layer, feature):
                     <Option name="type" value="collection" type="QString"/>
                   </Option>
                 </data_defined_properties>
-                <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+                <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                   <Option type="Map">
                     <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                     <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35009,7 +35010,7 @@ def my_form_open(dialog, layer, feature):
                 </layer>
               </symbol>
             </background>
-            <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+            <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
             <dd_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -35033,10 +35034,10 @@ def my_form_open(dialog, layer, feature):
         </ComposerMapGrid>
         <AtlasMap atlasDriven="0" scalingMode="2" margin="0.10000000000000001"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -35054,13 +35055,13 @@ def my_form_open(dialog, layer, feature):
           <Option name="singleFile" value="false" type="QString"/>
         </Option>
       </customproperties>
-      <Atlas enabled="0" pageNameExpression="&quot;FID&quot;" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" coverageLayerName="residents_access" sortFeatures="0" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" hideCoverage="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/residents_access.shp|layername=residents_access" coverageLayer="residents_access_ef8f0657_7c4c_4ecc_8c39_8c54d8ac4f2e" sortFeatures="0" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'Gun Run ' || format_date( now() , 'yyyy') || ' - Residents Access'" pageNameExpression="&quot;FID&quot;" enabled="0" hideCoverage="1" coverageLayerName="residents_access"/>
     </Layout>
-    <Layout printResolution="120" worldFileMap="" units="mm" name="Marshal Plan">
-      <Snapper snapToGuides="1" snapToGrid="0" tolerance="5" snapToItems="1"/>
-      <Grid offsetUnits="mm" offsetX="0" resolution="10" resUnits="mm" offsetY="0"/>
+    <Layout worldFileMap="" printResolution="120" name="Marshal Plan" units="mm">
+      <Snapper tolerance="5" snapToGrid="0" snapToItems="1" snapToGuides="1"/>
+      <Grid resUnits="mm" offsetX="0" resolution="10" offsetY="0" offsetUnits="mm"/>
       <PageCollection>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35068,7 +35069,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35102,9 +35103,9 @@ def my_form_open(dialog, layer, feature):
             </data_defined_properties>
           </layer>
         </symbol>
-        <LayoutItem referencePoint="0" type="65638" opacity="1" size="297,420,mm" groupUuid="" frame="false" excludeFromExports="0" position="0,0,mm" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" background="true" itemRotation="0" outlineWidthM="0.3,mm" positionLock="false" blendMode="0" zValue="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" id="" positionOnPage="0,0,mm" frameJoinStyle="miter" visibility="1">
-          <FrameColor alpha="255" blue="0" green="0" red="0"/>
-          <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+        <LayoutItem id="" uuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" referencePoint="0" templateUuid="{c203f6eb-3b7a-42a7-8c67-75420a7eb02d}" position="0,0,mm" blendMode="0" opacity="1" size="297,420,mm" positionLock="false" positionOnPage="0,0,mm" groupUuid="" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="0" type="65638">
+          <FrameColor green="0" blue="0" alpha="255" red="0"/>
+          <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
           <LayoutObject>
             <dataDefinedProperties>
               <Option type="Map">
@@ -35117,7 +35118,7 @@ def my_form_open(dialog, layer, feature):
               <Option/>
             </customproperties>
           </LayoutObject>
-          <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+          <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
             <data_defined_properties>
               <Option type="Map">
                 <Option name="name" value="" type="QString"/>
@@ -35125,7 +35126,7 @@ def my_form_open(dialog, layer, feature):
                 <Option name="type" value="collection" type="QString"/>
               </Option>
             </data_defined_properties>
-            <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+            <layer class="SimpleFill" locked="0" enabled="1" pass="0">
               <Option type="Map">
                 <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                 <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35162,9 +35163,9 @@ def my_form_open(dialog, layer, feature):
         </LayoutItem>
         <GuideCollection visible="1"/>
       </PageCollection>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="1" size="23.5967,8.3142,mm" groupUuid="" frame="false" excludeFromExports="0" position="112.086,406.476,mm" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="9" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" id="" labelText="Page [% &quot;page&quot; %] " positionOnPage="112.086,406.476,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" halign="4" referencePoint="0" labelText="Page [% &quot;page&quot; %] " marginX="0" templateUuid="{e80a7a81-88a9-4e36-a24b-3fc8125e32e9}" position="112.086,406.476,mm" blendMode="0" opacity="1" size="23.5967,8.3142,mm" positionLock="true" positionOnPage="112.086,406.476,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="9" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35177,12 +35178,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35190,7 +35191,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35225,7 +35226,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35235,9 +35236,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="0" size="27.7839,7.51682,mm" groupUuid="" frame="false" excludeFromExports="0" position="214.292,406.874,mm" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="8" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" id="" labelText="REVISION 4.0" positionOnPage="214.292,406.874,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" halign="2" referencePoint="0" labelText="REVISION 4.1" marginX="0" templateUuid="{515e5f3b-c04c-42cc-830e-f1cb41fd62c8}" position="214.292,406.874,mm" blendMode="0" opacity="1" size="27.7839,7.51682,mm" positionLock="true" positionOnPage="214.292,406.874,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="8" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35250,12 +35251,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35263,7 +35264,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35298,7 +35299,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35308,9 +35309,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" background="true" groupUuid="" positionLock="true" blendMode="0" wrapChar="" fontColor="#000000" symbolWidth="7" resizeToContents="1" type="65642" visibility="1" id="" columnCount="1" maxSymbolSize="0" itemRotation="0" zValue="7" symbolHeight="4" rasterBorderColor="0,0,0,255" excludeFromExports="0" splitLayer="0" minSymbolSize="0" referencePoint="0" size="21.6797,33,mm" titleAlignment="1" position="15.6525,12.5708,mm" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" equalColumnWidth="1" legendFilterByAtlas="0" symbolAlignment="1" title="" wmsLegendWidth="50" columnSpace="2" positionOnPage="15.6525,12.5708,mm" rasterBorderWidth="0" frame="false" frameJoinStyle="miter" wmsLegendHeight="25" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" opacity="1" boxSpace="2" lineSpacing="1" outlineWidthM="0.3,mm" rasterBorder="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem columnSpace="2" rasterBorder="1" uuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" title="" lineSpacing="1" boxSpace="2" rasterBorderColor="0,0,0,255" referencePoint="0" positionOnPage="15.6525,12.5708,mm" type="65642" legendFilterByAtlas="0" symbolHeight="4" rasterBorderWidth="0" visibility="1" titleAlignment="1" minSymbolSize="0" maxSymbolSize="0" resizeToContents="1" map_uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" frame="false" equalColumnWidth="1" itemRotation="0" zValue="7" background="true" symbolWidth="7" templateUuid="{1469a46a-bf8d-4b7a-9ea2-d0511f01ca66}" blendMode="0" opacity="1" position="15.6525,12.5708,mm" positionLock="true" columnCount="1" splitLayer="0" wmsLegendHeight="25" outlineWidthM="0.3,mm" size="21.6797,33,mm" groupUuid="" excludeFromExports="0" fontColor="#000000" frameJoinStyle="miter" id="" symbolAlignment="1" wmsLegendWidth="50" wrapChar="">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35324,31 +35325,31 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
         <styles>
-          <style alignment="1" name="title" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="title" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,16,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="group" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style indent="0" name="group" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,14,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="subgroup" marginTop="1" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="1" indent="0" name="subgroup" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
-          <style alignment="1" name="symbol" marginTop="2" indent="0">
-            <styleFont style="" bold="0" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" name="symbol" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="" description="Myriad Pro,10,-1,5,50,0,0,0,0,0" italic="0" bold="0"/>
           </style>
-          <style alignment="1" name="symbolLabel" marginTop="2" marginLeft="2" indent="0">
-            <styleFont style="Semibold" bold="1" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" strikethrough="0" italic="0" underline="0"/>
+          <style marginTop="2" indent="0" marginLeft="2" name="symbolLabel" alignment="1">
+            <styleFont underline="0" strikethrough="0" style="Semibold" description="Myriad Pro,10,-1,5,75,0,0,0,0,0,Semibold" italic="0" bold="1"/>
           </style>
         </styles>
         <layer-tree-group>
           <customproperties>
             <Option/>
           </customproperties>
-          <layer-tree-group expanded="1" groupLayer="" name="Routes" checked="Qt::Checked">
+          <layer-tree-group checked="Qt::Checked" expanded="1" name="Routes" groupLayer="">
             <customproperties>
               <Option/>
             </customproperties>
-            <layer-tree-layer id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" providerKey="ogr" expanded="1" name="all_routes" legend_exp="" patch_size="0,0" source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" legend_split_behavior="0">
+            <layer-tree-layer source="./all_routes.shp|layername=all_routes" checked="Qt::Checked" id="all_routes_5833accf_77da_42ef_a24a_197208cd2190" patch_size="0,0" expanded="1" providerKey="ogr" name="all_routes" legend_split_behavior="0" legend_exp="">
               <customproperties>
                 <Option type="Map">
                   <Option name="expandedLegendNodes" type="invalid"/>
@@ -35362,9 +35363,9 @@ def my_form_open(dialog, layer, feature):
           <custom-order enabled="0"/>
         </layer-tree-group>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="0" size="45.1194,8.13137,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.69321,398.344,mm" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="6" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" id="" labelText="MARSHAL POSITIONS" positionOnPage="5.69321,398.344,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" halign="1" referencePoint="0" labelText="MARSHAL POSITIONS" marginX="0" templateUuid="{7809d8ef-2cb9-41ce-a43e-ab350b405133}" position="5.69321,398.344,mm" blendMode="0" opacity="1" size="45.1194,8.13137,mm" positionLock="true" positionOnPage="5.69321,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="0" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="6" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35377,12 +35378,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="63" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="63" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35390,7 +35391,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35425,7 +35426,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35435,9 +35436,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="32" opacity="1" htmlState="1" size="118.192,7.80192,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.69321,406.988,mm" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="5" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="5.69321,406.988,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" halign="1" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN '5KM Walk, Pet Walk &amp; Trail'&#xa;WHEN &quot;day&quot; = '2' THEN '21KM &amp; 10KM'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{e68b6800-4c3f-494c-8bb8-5995b9419664}" position="5.69321,406.988,mm" blendMode="0" opacity="1" size="118.192,7.80192,mm" positionLock="true" positionOnPage="5.69321,406.988,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="32" zValue="5" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35450,12 +35451,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35463,7 +35464,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35498,7 +35499,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35508,9 +35509,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65641" valign="64" opacity="1" htmlState="1" size="93.5757,8.13167,mm" groupUuid="" frame="false" excludeFromExports="0" position="148.501,398.344,mm" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" background="false" marginY="1" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" marginX="0" blendMode="0" zValue="4" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" id="" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" positionOnPage="148.501,398.344,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" halign="2" referencePoint="0" labelText="&lt;strong>[%CASE&#xa;WHEN &quot;day&quot; = '1' THEN 'Saturday, 17th September, 2022'&#xa;WHEN &quot;day&quot; = '2' THEN 'Sunday, 18th September, 2022'&#xa;END&#xa;%]&lt;/strong>" marginX="0" templateUuid="{dff19ea3-9875-466a-9e36-833d5f362e9c}" position="148.501,398.344,mm" blendMode="0" opacity="1" size="93.5757,8.13167,mm" positionLock="true" positionOnPage="148.501,398.344,mm" marginY="1" groupUuid="" excludeFromExports="0" htmlState="1" background="false" frameJoinStyle="miter" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" valign="64" zValue="4" type="65641">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35523,12 +35524,12 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <text-style fontWordSpacing="0" fontWeight="50" fontUnderline="0" fontStrikeout="0" namedStyle="" textOpacity="1" multilineHeight="1" previewBkgrdColor="255,255,255,255" forcedItalic="0" capitalization="0" textOrientation="horizontal" fontSize="12" forcedBold="0" textColor="0,0,0,255" fontSizeMapUnitScale="3x:0,0,0,0,0,0" fontItalic="0" fontLetterSpacing="0" blendMode="0" allowHtml="0" fontFamily="Myriad Pro" fontKerning="1" fontSizeUnit="Point">
+        <text-style fontKerning="1" capitalization="0" fontFamily="Myriad Pro" fontWeight="50" fontLetterSpacing="0" blendMode="0" fontSizeUnit="Point" fontStrikeout="0" namedStyle="" fontSizeMapUnitScale="3x:0,0,0,0,0,0" previewBkgrdColor="255,255,255,255" fontSize="12" forcedItalic="0" fontItalic="0" textOrientation="horizontal" allowHtml="0" fontUnderline="0" textOpacity="1" fontWordSpacing="0" textColor="0,0,0,255" multilineHeight="1" forcedBold="0">
           <families/>
-          <text-buffer bufferSize="1" bufferSizeUnits="MM" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferDraw="0" bufferColor="255,255,255,255" bufferOpacity="1" bufferBlendMode="0" bufferNoFill="1" bufferJoinStyle="128"/>
-          <text-mask maskSizeUnits="MM" maskJoinStyle="128" maskSizeMapUnitScale="3x:0,0,0,0,0,0" maskOpacity="1" maskedSymbolLayers="" maskType="0" maskSize="1.5" maskEnabled="0"/>
-          <background shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeSizeType="0" shapeJoinStyle="64" shapeRotationType="0" shapeRadiiY="0" shapeRotation="0" shapeBorderWidth="0" shapeBorderColor="128,128,128,255" shapeSizeUnit="MM" shapeDraw="0" shapeRadiiUnit="MM" shapeOffsetX="0" shapeOpacity="1" shapeSizeX="0" shapeRadiiX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthUnit="MM" shapeSizeY="0" shapeOffsetY="0" shapeBlendMode="0" shapeType="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeFillColor="255,255,255,255" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeOffsetUnit="MM" shapeSVGFile="">
-            <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="fillSymbol" frame_rate="10" type="fill">
+          <text-buffer bufferDraw="0" bufferSizeMapUnitScale="3x:0,0,0,0,0,0" bufferOpacity="1" bufferNoFill="1" bufferColor="255,255,255,255" bufferSize="1" bufferBlendMode="0" bufferJoinStyle="128" bufferSizeUnits="MM"/>
+          <text-mask maskJoinStyle="128" maskOpacity="1" maskedSymbolLayers="" maskSize="1.5" maskSizeUnits="MM" maskEnabled="0" maskType="0" maskSizeMapUnitScale="3x:0,0,0,0,0,0"/>
+          <background shapeOffsetY="0" shapeSizeY="0" shapeSizeUnit="MM" shapeSizeType="0" shapeBlendMode="0" shapeSVGFile="" shapeOffsetX="0" shapeOffsetMapUnitScale="3x:0,0,0,0,0,0" shapeSizeX="0" shapeRotation="0" shapeBorderColor="128,128,128,255" shapeBorderWidthUnit="MM" shapeRadiiX="0" shapeSizeMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidthMapUnitScale="3x:0,0,0,0,0,0" shapeBorderWidth="0" shapeType="0" shapeFillColor="255,255,255,255" shapeJoinStyle="64" shapeOpacity="1" shapeRadiiMapUnitScale="3x:0,0,0,0,0,0" shapeDraw="0" shapeOffsetUnit="MM" shapeRadiiY="0" shapeRotationType="0" shapeRadiiUnit="MM">
+            <symbol force_rhr="0" is_animated="0" name="fillSymbol" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
               <data_defined_properties>
                 <Option type="Map">
                   <Option name="name" value="" type="QString"/>
@@ -35536,7 +35537,7 @@ def my_form_open(dialog, layer, feature):
                   <Option name="type" value="collection" type="QString"/>
                 </Option>
               </data_defined_properties>
-              <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+              <layer class="SimpleFill" locked="0" enabled="1" pass="0">
                 <Option type="Map">
                   <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
                   <Option name="color" value="255,255,255,255" type="QString"/>
@@ -35571,7 +35572,7 @@ def my_form_open(dialog, layer, feature):
               </layer>
             </symbol>
           </background>
-          <shadow shadowOffsetAngle="135" shadowRadiusUnit="MM" shadowOffsetDist="1" shadowOpacity="0.69999999999999996" shadowUnder="0" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowColor="0,0,0,255" shadowOffsetUnit="MM" shadowRadius="1.5" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowScale="100" shadowOffsetGlobal="1" shadowDraw="0" shadowBlendMode="6" shadowRadiusAlphaOnly="0"/>
+          <shadow shadowOffsetAngle="135" shadowRadiusAlphaOnly="0" shadowOpacity="0.69999999999999996" shadowRadiusUnit="MM" shadowDraw="0" shadowBlendMode="6" shadowRadius="1.5" shadowUnder="0" shadowOffsetUnit="MM" shadowScale="100" shadowRadiusMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetDist="1" shadowOffsetMapUnitScale="3x:0,0,0,0,0,0" shadowOffsetGlobal="1" shadowColor="0,0,0,255"/>
           <dd_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35581,9 +35582,9 @@ def my_form_open(dialog, layer, feature):
           </dd_properties>
         </text-style>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65640" anchorPoint="8" pictureHeight="26.4325" svgBorderColor="0,0,0,255" opacity="1" pictureWidth="49.3143" svgFillColor="255,255,255,255" size="49.3143,31.2967,mm" groupUuid="" pictureRotation="0" frame="false" northMode="0" excludeFromExports="0" position="243.319,382.696,mm" mapUuid="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" svgBorderWidth="0.2" mode="1" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="3" file="../GunRun2022_250.png" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" id="" positionOnPage="243.319,382.696,mm" frameJoinStyle="miter" visibility="1" resizeMode="0" northOffset="0">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" referencePoint="0" templateUuid="{a121a895-fe7f-417e-94fd-0277fc3cfdaa}" position="243.319,382.696,mm" anchorPoint="8" blendMode="0" opacity="1" pictureHeight="26.4325" size="49.3143,31.2967,mm" positionLock="true" svgBorderWidth="0.2" northOffset="0" positionOnPage="243.319,382.696,mm" svgBorderColor="0,0,0,255" northMode="0" file="../GunRun2022_250.png" pictureWidth="49.3143" groupUuid="" mapUuid="" excludeFromExports="0" background="false" frameJoinStyle="miter" resizeMode="0" svgFillColor="255,255,255,255" pictureRotation="0" visibility="1" mode="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="3" type="65640">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35603,9 +35604,9 @@ def my_form_open(dialog, layer, feature):
           </customproperties>
         </LayoutObject>
       </LayoutItem>
-      <LayoutItem referencePoint="0" type="65643" opacity="1" size="236.083,0.14328,mm" groupUuid="" frame="false" excludeFromExports="0" position="5.84321,406.626,mm" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" background="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="2" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" cornerRadiusMeasure="0,mm" id="" positionOnPage="5.84321,406.626,mm" frameJoinStyle="miter" shapeType="1" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" referencePoint="0" templateUuid="{07662916-b6f3-44a6-9ec6-b07cb2965a1e}" position="5.84321,406.626,mm" blendMode="0" opacity="1" size="236.083,0.14328,mm" positionLock="true" positionOnPage="5.84321,406.626,mm" groupUuid="" excludeFromExports="0" shapeType="1" background="false" frameJoinStyle="miter" cornerRadiusMeasure="0,mm" visibility="1" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="2" type="65643">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35618,7 +35619,7 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <symbol is_animated="0" alpha="1" clip_to_extent="1" force_rhr="0" name="" frame_rate="10" type="fill">
+        <symbol force_rhr="0" is_animated="0" name="" clip_to_extent="1" alpha="1" frame_rate="10" type="fill">
           <data_defined_properties>
             <Option type="Map">
               <Option name="name" value="" type="QString"/>
@@ -35626,7 +35627,7 @@ def my_form_open(dialog, layer, feature):
               <Option name="type" value="collection" type="QString"/>
             </Option>
           </data_defined_properties>
-          <layer enabled="1" class="SimpleFill" locked="0" pass="0">
+          <layer class="SimpleFill" locked="0" enabled="1" pass="0">
             <Option type="Map">
               <Option name="border_width_map_unit_scale" value="3x:0,0,0,0,0,0" type="QString"/>
               <Option name="color" value="0,0,0,255" type="QString"/>
@@ -35661,9 +35662,9 @@ def my_form_open(dialog, layer, feature):
           </layer>
         </symbol>
       </LayoutItem>
-      <LayoutItem drawCanvasItems="false" labelMargin="0,mm" referencePoint="0" type="65639" opacity="1" mapRotation="0" size="286.94,392.396,mm" groupUuid="" frame="false" followPresetName="Marshal overview" excludeFromExports="0" position="5.03,5.9483,mm" followPreset="true" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" isTemporal="0" background="true" keepLayerSet="false" itemRotation="0" outlineWidthM="0.3,mm" positionLock="true" blendMode="0" zValue="1" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" id="" mapFlags="0" positionOnPage="5.03,5.9483,mm" frameJoinStyle="miter" visibility="1">
-        <FrameColor alpha="255" blue="0" green="0" red="0"/>
-        <BackgroundColor alpha="255" blue="255" green="255" red="255"/>
+      <LayoutItem id="" uuid="{8ff439cd-f9a2-4318-a778-a55335437202}" referencePoint="0" templateUuid="{8ff439cd-f9a2-4318-a778-a55335437202}" position="5.03,5.9483,mm" mapRotation="0" isTemporal="0" blendMode="0" labelMargin="0,mm" opacity="1" size="286.94,392.396,mm" mapFlags="0" positionLock="true" positionOnPage="5.03,5.9483,mm" keepLayerSet="false" groupUuid="" followPreset="true" excludeFromExports="0" background="true" frameJoinStyle="miter" visibility="1" drawCanvasItems="false" followPresetName="Marshal overview" outlineWidthM="0.3,mm" frame="false" itemRotation="0" zValue="1" type="65639">
+        <FrameColor green="0" blue="0" alpha="255" red="0"/>
+        <BackgroundColor green="255" blue="255" alpha="255" red="255"/>
         <LayoutObject>
           <dataDefinedProperties>
             <Option type="Map">
@@ -35692,14 +35693,14 @@ def my_form_open(dialog, layer, feature):
             <Option/>
           </customproperties>
         </LayoutObject>
-        <Extent ymin="-33.94797288016832226" ymax="-33.9248732774534929" xmax="18.38613924055453452" xmin="18.36924763341120581"/>
+        <Extent xmin="18.40977343001242872" xmax="18.42666503715575743" ymax="-33.89590406990863158" ymin="-33.91900367262346094"/>
         <LayerSet/>
         <AtlasMap atlasDriven="1" scalingMode="2" margin="0"/>
         <labelBlockingItems/>
-        <atlasClippingSettings enabled="0" forceLabelsInside="0" restrictLayers="0" clippingType="0">
+        <atlasClippingSettings clippingType="0" enabled="0" forceLabelsInside="0" restrictLayers="0">
           <layersToClip/>
         </atlasClippingSettings>
-        <itemClippingSettings enabled="0" forceLabelsInside="0" clipSource="" clippingType="0"/>
+        <itemClippingSettings clipSource="" clippingType="0" enabled="0" forceLabelsInside="0"/>
       </LayoutItem>
       <customproperties>
         <Option type="Map">
@@ -35717,14 +35718,14 @@ def my_form_open(dialog, layer, feature):
           <Option name="pdfTextFormat" value="0" type="int"/>
         </Option>
       </customproperties>
-      <Atlas enabled="1" pageNameExpression="&quot;page&quot;" filenamePattern="'output_'||@atlas_featurenumber" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortKey="page" coverageLayerName="marshal_overviews" sortFeatures="1" coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" hideCoverage="1" sortAscending="1" filterFeatures="0" coverageLayerProvider="ogr"/>
+      <Atlas coverageLayerSource="/home/tim/Documents/Projects/2022/Gun Run/Maps/GIS Base Map/marshal overviews.shp|layername=marshal overviews" coverageLayer="marshal_overviews_ae605fdd_ce43_477e_ac61_28d3b8c11c51" sortFeatures="1" coverageLayerProvider="ogr" filterFeatures="0" filenamePattern="'output_'||@atlas_featurenumber" sortAscending="1" pageNameExpression="&quot;page&quot;" sortKey="page" enabled="1" hideCoverage="1" coverageLayerName="marshal_overviews"/>
     </Layout>
   </Layouts>
   <mapViewDocks3D/>
   <Bookmarks/>
-  <ProjectViewSettings UseProjectScales="0" rotation="0">
+  <ProjectViewSettings rotation="0" UseProjectScales="0">
     <Scales/>
-    <DefaultViewExtent ymin="-33.90871482956616489" ymax="-33.90423630387739706" xmax="18.40994200790283131" xmin="18.40161633768571292">
+    <DefaultViewExtent xmin="18.37956087983462439" xmax="18.4295149011373347" ymax="-33.89386282439181031" ymin="-33.92073397852443151">
       <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>
@@ -35738,13 +35739,13 @@ def my_form_open(dialog, layer, feature):
       </spatialrefsys>
     </DefaultViewExtent>
   </ProjectViewSettings>
-  <ProjectStyleSettings RandomizeDefaultSymbolColor="1" DefaultSymbolOpacity="1" projectStyleId="attachment:///QnVUUv_styles.db">
+  <ProjectStyleSettings projectStyleId="attachment:///QnVUUv_styles.db" DefaultSymbolOpacity="1" RandomizeDefaultSymbolColor="1">
     <databases/>
   </ProjectStyleSettings>
-  <ProjectTimeSettings cumulativeTemporalRange="0" frameRate="1" timeStepUnit="h" timeStep="1"/>
+  <ProjectTimeSettings timeStepUnit="h" frameRate="1" timeStep="1" cumulativeTemporalRange="0"/>
   <ElevationProperties>
     <terrainProvider type="flat">
-      <TerrainProvider scale="1" offset="0"/>
+      <TerrainProvider offset="0" scale="1"/>
     </terrainProvider>
   </ElevationProperties>
   <ProjectDisplaySettings>
diff --git a/GIS Base Map/marshal overviews.dbf b/GIS Base Map/marshal overviews.dbf
index 1eb36223775b5d870d3bff9c6882d9dccfb94f2c..373f75173913dc228e74a2225416c83de74b00df 100644
GIT binary patch
delta 92
zcmaFI@{Watxr&o#BFi!+Lxaf&7-c4&5M(q2GGr%y7hp63F(#`r3NRXjSU^&ZQFn49
kqaC9Okgq$Lol$NwH<JLP8CabqlfcBAa_r_t3P2zQ0O8IU<p2Nx

delta 85
zcmaFI@{Watxr#$>BFnPL6By+to)Dbu$s{-NyTIhPjB=Az83iUMGs-a;8%}O!)S2AK
bXg7HxQ1~uT7({b3L1;?|&2Da_00dG1k7O97

diff --git a/GIS Base Map/marshal overviews.shp b/GIS Base Map/marshal overviews.shp
index 1d09a49f86b9b741ff412a06ee3a9603c0e9f0a0..19b185dfe3d3f797c221fa01e135af1e2c08b0c7 100644
GIT binary patch
delta 281
zcmdnOy@h*%4eNIs-dSfhI$me0zqw}8uaBul4q=jv%gVkw960=L+aH%KBZoJiM5E4s
zayY=qz`(!?#2^4ud+7SiB}G8BMZpdU-+_8zYQ0UY7dip;b}@G)Tmb5YnFTW&T|dys
zdUhb;0J5NW8h=4qijhNN@{gy*K*P&#7#E$)FmeDp70n?qwPzJ4KFJ5FRkPiDwHl}w
jruM(=4zc4vy;FS~7n}v^g_#928=;>WXuxJkmf4H|p~-yu

delta 281
zcmdnOy@h*%4eR>M)mzSObiB?~uRhztQYhWXVUvEq=JKx&2L$iNSf^$iIe2iUreFBv
zaDb74fq@l>K>(&!?%j)x#Xz+O9G}e-2kM2XovHNjeiBgcGs&B|7lC?VX2Hxx*AFzZ
zo*hUyfGmh=sP{@sHFA)gFpZ%MXt>Lv#XdVTjU2#EMRN#DZL6RD|3aYJ&uY3GvVnSG
jYR|B1eB1`q>suwi`#exD%q*DM2>r}J12#*t%w_}t#7J-;

diff --git a/GIS Base Map/marshal overviews.shx b/GIS Base Map/marshal overviews.shx
index 69e7b0486d107c81c3edf2215512740a1bc5f085..e5e77d1fb2b0bb589287ac8157a8b4ec96d4d211 100644
GIT binary patch
delta 15
XcmdnOxP@_o4eNIs-dSfRIu-)}FA@eP

delta 15
XcmdnOxP@_o4eR>M)mzR@bSwq{GD`-=